diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/command.c | 6 | ||||
| -rw-r--r-- | lib/ferr.c | 7 | ||||
| -rw-r--r-- | lib/workqueue.c | 8 |
3 files changed, 2 insertions, 19 deletions
diff --git a/lib/command.c b/lib/command.c index 0bf856f248..a98654dd23 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/ferr.c b/lib/ferr.c index d315cf843c..45574520a5 100644 --- a/lib/ferr.c +++ b/lib/ferr.c @@ -70,13 +70,6 @@ static ferr_r ferr_set_va(const char *file, int line, const char *func, if (!error) { error = XCALLOC(MTYPE_ERRINFO, sizeof(*error)); - if (!error) { - /* we're screwed */ - zlog_err("out of memory while allocating error info"); - raise(SIGSEGV); - abort(); /* raise() can return, but raise(SIGSEGV) shall - not */ - } pthread_setspecific(errkey, error); } diff --git a/lib/workqueue.c b/lib/workqueue.c index 39dd142afb..c927d5d714 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); |