public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: agk@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/libdm libdm-config.c Date: Tue, 28 Feb 2012 17:46:00 -0000 [thread overview] Message-ID: <20120228174648.2626.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: agk@sourceware.org 2012-02-28 17:46:47 Modified files: libdm : libdm-config.c Log message: Fix empty string warning logic in _find_config_str. (1.02.68) pvcreate gives WARNING: Ignoring unsupported value for metadata/pvmetadataignore. It was warning if there is no config file entry instead of only if the node exists but is empty. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-config.c.diff?cvsroot=lvm2&r1=1.21&r2=1.22 --- LVM2/libdm/libdm-config.c 2012/01/23 17:47:36 1.21 +++ LVM2/libdm/libdm-config.c 2012/02/28 17:46:47 1.22 @@ -751,14 +751,16 @@ { const struct dm_config_node *n = find_fn(start, path); - /* Empty strings are ignored */ - if ((n && n->v && n->v->type == DM_CFG_STRING) && - (allow_empty || (*n->v->v.str))) { - log_very_verbose("Setting %s to %s", path, n->v->v.str); - return n->v->v.str; - } else if (n && (!n->v || (n->v->type != DM_CFG_STRING) || - (!allow_empty && fail))) - log_warn("WARNING: Ignoring unsupported value for %s.", path); + /* Empty strings are ignored if allow_empty is set */ + if (n && n->v) { + if ((n->v->type == DM_CFG_STRING) && + (allow_empty || (*n->v->v.str))) { + log_very_verbose("Setting %s to %s", path, n->v->v.str); + return n->v->v.str; + } + if ((n->v->type != DM_CFG_STRING) || (!allow_empty && fail)) + log_warn("WARNING: Ignoring unsupported value for %s.", path); + } if (fail) log_very_verbose("%s not found in config: defaulting to %s",
next reply other threads:[~2012-02-28 17:46 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-02-28 17:46 agk [this message] -- strict thread matches above, loose matches on Subject: below -- 2012-01-23 17:47 agk 2012-01-19 15:16 zkabelac 2011-12-11 15:18 mornfall 2011-09-25 19:45 zkabelac 2011-09-25 19:43 zkabelac 2011-09-25 19:42 zkabelac 2011-09-25 19:41 zkabelac 2011-09-25 19:40 zkabelac 2011-09-25 19:39 zkabelac 2011-09-01 14:02 zkabelac
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120228174648.2626.qmail@sourceware.org \ --to=agk@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).