diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2012-02-08 11:40:02 +0000 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2012-02-08 11:40:02 +0000 |
commit | d75c5f06f0d08868ebc6de7d04bfe81a89da0d67 (patch) | |
tree | 859b3f572c4f9c6c3c3c18c7ba3f6c6e07cd5a82 | |
parent | a6292f2a6dbc01596fe0c46318877fc4186a5f7f (diff) | |
download | lvm2-d75c5f06f0d08868ebc6de7d04bfe81a89da0d67.tar.gz lvm2-d75c5f06f0d08868ebc6de7d04bfe81a89da0d67.tar.xz lvm2-d75c5f06f0d08868ebc6de7d04bfe81a89da0d67.zip |
Replace snprintf with dm_snprintf
snprintf testing for negative is replaced with dm_snprintf where this
test really works.
Add missing test for result of dm_snprintf().
-rw-r--r-- | lib/filters/filter-mpath.c | 2 | ||||
-rw-r--r-- | lib/metadata/mirror.c | 8 | ||||
-rw-r--r-- | tools/vgcfgbackup.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/filters/filter-mpath.c b/lib/filters/filter-mpath.c index c4707d3f..8ab3cfdc 100644 --- a/lib/filters/filter-mpath.c +++ b/lib/filters/filter-mpath.c @@ -60,7 +60,7 @@ static int get_sysfs_get_major_minor(const char *sysfs_dir, const char *kname, i { char path[PATH_MAX], buffer[64]; - if (snprintf(path, sizeof(path), "%s/block/%s/dev", sysfs_dir, kname) < 0) + if (dm_snprintf(path, sizeof(path), "%s/block/%s/dev", sysfs_dir, kname) < 0) return_0; if (!get_sysfs_string(path, buffer, sizeof(buffer))) diff --git a/lib/metadata/mirror.c b/lib/metadata/mirror.c index 38f4d135..28d783f1 100644 --- a/lib/metadata/mirror.c +++ b/lib/metadata/mirror.c @@ -696,9 +696,11 @@ static int _split_mirror_images(struct logical_volume *lv, dm_list_iterate_items(lvl, &split_images) { sub_lv = lvl->lv; - dm_snprintf(format, len, "%s_mimage_%%d", - new_lv->name); - + if (dm_snprintf(format, len, "%s_mimage_%%d", + new_lv->name) < 0) { + log_error("Failed to build new image name."); + return 0; + } layer_name = dm_pool_alloc(lv->vg->vgmem, len); if (!layer_name) { log_error("Unable to allocate memory"); diff --git a/tools/vgcfgbackup.c b/tools/vgcfgbackup.c index 2be39493..c5d712f1 100644 --- a/tools/vgcfgbackup.c +++ b/tools/vgcfgbackup.c @@ -28,7 +28,7 @@ static char *_expand_filename(const char *template, const char *vg_name, return NULL; } - if (snprintf(filename, PATH_MAX, template, vg_name) < 0) { + if (dm_snprintf(filename, PATH_MAX, template, vg_name) < 0) { log_error("Error processing filename template %s", template); dm_free(filename); |