From 2925023411ff9c7a32fa7660617c94a9d9dcd653 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Tue, 23 Apr 2013 11:58:50 +0200 Subject: [PATCH] cleanup: improve messages Add verbose message when we will not obtain devices from udev (i.e. testing is using different udev dir, and the log was giving misleading info about using udev) Add proper error message if zalloc from pull would have failed. Fix typo obolete -> obsolete --- lib/commands/toolcontext.c | 3 +++ lib/config/config.c | 6 ++++-- lib/filters/filter-persistent.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index c42a0bf21..8f06285fa 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -777,6 +777,9 @@ static int _init_dev_cache(struct cmd_context *cmd) udev_dir_len != len; if (len_diff || strncmp(DM_UDEV_DEV_DIR, cv->v.str, len)) { + log_very_verbose("Non standard udev dir %s, resetting " + "devices/obtain_device_list_from_udev.", + cv->v.str); device_list_from_udev = 0; init_obtain_device_list_from_udev(0); } diff --git a/lib/config/config.c b/lib/config/config.c index ad02f5fb3..e999fc697 100644 --- a/lib/config/config.c +++ b/lib/config/config.c @@ -64,8 +64,10 @@ struct dm_config_tree *config_file_open(const char *filename, int keep_open) if (!cft) return NULL; - cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file)); - if (!cf) goto fail; + if (!(cf = dm_pool_zalloc(cft->mem, sizeof(struct config_file)))) { + log_error("Failed to allocate condig tree."); + goto fail; + } cf->keep_open = keep_open; dm_config_set_custom(cft, cf); diff --git a/lib/filters/filter-persistent.c b/lib/filters/filter-persistent.c index bec396b22..0d53fce42 100644 --- a/lib/filters/filter-persistent.c +++ b/lib/filters/filter-persistent.c @@ -103,8 +103,8 @@ int persistent_filter_load(struct dev_filter *f, struct dm_config_tree **cft_out if (obtain_device_list_from_udev()) { if (!stat(pf->file, &info)) { - log_very_verbose("Obtaining device list from " - "udev. Removing obolete %s.", + log_very_verbose("Obtaining device list from udev. " + "Removing obsolete %s.", pf->file); if (unlink(pf->file) < 0 && errno != EROFS) log_sys_error("unlink", pf->file);