diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-14 14:58:05 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-08-11 17:14:58 +0200 |
| commit | 0ce1ca805d607cec2c0f75dac8950f40e75fc971 (patch) | |
| tree | bf34e7a0084ae76089d43ee7f2c4ca8eeed62c8a /lib | |
| parent | Merge pull request #2809 from opensourcerouting/routemap-rpki-fix (diff) | |
| download | frr-0ce1ca805d607cec2c0f75dac8950f40e75fc971.tar.xz frr-0ce1ca805d607cec2c0f75dac8950f40e75fc971.zip | |
*: ALLOC calls cannot fail
There is no need to check for failure of a ALLOC call
as that any failure to do so will result in a assert
happening. So we can safely remove all of this code.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.c | 6 | ||||
| -rw-r--r-- | lib/workqueue.c | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/command.c b/lib/command.c index 0bf856f24..a98654dd2 100644 --- a/lib/command.c +++ b/lib/command.c @@ -2409,11 +2409,7 @@ static int set_log_file(struct vty *vty, const char *fname, int loglevel) return CMD_WARNING_CONFIG_FAILED; } - if ((p = XMALLOC(MTYPE_TMP, strlen(cwd) + strlen(fname) + 2)) - == NULL) { - zlog_err("config_log_file: Unable to alloc mem!"); - return CMD_WARNING_CONFIG_FAILED; - } + p = XMALLOC(MTYPE_TMP, strlen(cwd) + strlen(fname) + 2); sprintf(p, "%s/%s", cwd, fname); fullpath = p; } else diff --git a/lib/workqueue.c b/lib/workqueue.c index 39dd142af..c927d5d71 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -81,9 +81,6 @@ struct work_queue *work_queue_new(struct thread_master *m, new = XCALLOC(MTYPE_WORK_QUEUE, sizeof(struct work_queue)); - if (new == NULL) - return new; - new->name = XSTRDUP(MTYPE_WORK_QUEUE_NAME, queue_name); new->master = m; SET_FLAG(new->flags, WQ_UNPLUGGED); @@ -152,10 +149,7 @@ void work_queue_add(struct work_queue *wq, void *data) assert(wq); - if (!(item = work_queue_item_new(wq))) { - zlog_err("%s: unable to get new queue item", __func__); - return; - } + item = work_queue_item_new(wq); item->data = data; work_queue_item_enqueue(wq, item); |