From: Dave Wysochanski Date: Sun, 26 Jul 2009 12:40:27 +0000 (+0000) Subject: Rename vg_size to vgsize to avoid naming conflicts. X-Git-Tag: old-v2_02_50~55 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=83f4e5b45754eeeeaf5e880901df153a4f79acf4;p=lvm2.git Rename vg_size to vgsize to avoid naming conflicts. Author: Dave Wysochanski --- diff --git a/lib/format_text/archive.c b/lib/format_text/archive.c index 165dc5c93..7fb2a483e 100644 --- a/lib/format_text/archive.c +++ b/lib/format_text/archive.c @@ -57,7 +57,7 @@ struct archive_file { /* * Extract vg name and version number from a filename. */ -static int _split_vg(const char *filename, char *vgname, size_t vg_size, +static int _split_vg(const char *filename, char *vgname, size_t vgsize, uint32_t *ix) { size_t len, vg_len; @@ -78,7 +78,7 @@ static int _split_vg(const char *filename, char *vgname, size_t vg_size, return 0; vg_len = underscore - filename; - if (vg_len + 1 > vg_size) + if (vg_len + 1 > vgsize) return 0; strncpy(vgname, filename, vg_len);