public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test/api test.c Date: Fri, 24 Jul 2009 04:15:00 -0000 [thread overview] Message-ID: <20090724041531.7466.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2009-07-24 04:15:30 Modified files: test/api : test.c Log message: Update test/api/test.c to not segfault if null lists of pvs/lvs returned. Author: Dave Wysochanski <dwysocha@redhat.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/api/test.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4 --- LVM2/test/api/test.c 2009/07/23 23:40:50 1.3 +++ LVM2/test/api/test.c 2009/07/24 04:15:30 1.4 @@ -124,14 +124,28 @@ } return vg; } +static void _add_lvs_to_lvname_hash(struct dm_list *lvs) +{ + struct lvm_lv_list *lvl; + dm_list_iterate_items(lvl, lvs) { + /* Concatenate VG name with LV name */ + dm_hash_insert(_lvname_hash, lvm_lv_get_name(lvl->lv), lvl->lv); + } +} + +static void _add_pvs_to_pvname_hash(struct dm_list *pvs) +{ + struct lvm_pv_list *pvl; + dm_list_iterate_items(pvl, pvs) { + dm_hash_insert(_pvname_hash, lvm_pv_get_name(pvl->pv), pvl->pv); + } +} static void _vg_open(char **argv, int argc, lvm_t libh) { vg_t *vg; struct dm_list *lvs; - struct lvm_lv_list *lvl; struct dm_list *pvs; - struct lvm_pv_list *pvl; if (argc < 2) { printf ("Please enter vg_name\n"); @@ -157,14 +171,11 @@ * Add the LVs and PVs into the hashes for lookups */ lvs = lvm_vg_list_lvs(vg); - dm_list_iterate_items(lvl, lvs) { - /* Concatenate VG name with LV name */ - dm_hash_insert(_lvname_hash, lvm_lv_get_name(lvl->lv), lvl->lv); - } + if (lvs && !dm_list_empty(lvs)) + _add_lvs_to_lvname_hash(lvs); pvs = lvm_vg_list_pvs(vg); - dm_list_iterate_items(pvl, pvs) { - dm_hash_insert(_pvname_hash, lvm_pv_get_name(pvl->pv), pvl->pv); - } + if (pvs && !dm_list_empty(pvs)) + _add_pvs_to_pvname_hash(pvs); } static void _vg_close(char **argv, int argc)
next reply other threads:[~2009-07-24 4:15 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-07-24 4:15 wysochanski [this message] -- strict thread matches above, loose matches on Subject: below -- 2011-03-01 23:29 zkabelac 2011-03-01 23:18 zkabelac 2010-11-25 14:35 mornfall 2010-11-17 20:13 mornfall 2010-11-17 19:17 mornfall 2010-10-25 14:09 wysochanski 2010-05-19 11:53 wysochanski 2010-02-24 18:16 wysochanski 2009-08-07 21:22 wysochanski 2009-07-28 14:12 wysochanski 2009-07-28 13:49 wysochanski 2009-07-27 21:02 wysochanski 2009-07-27 17:45 wysochanski 2009-07-26 20:59 wysochanski 2009-07-26 20:58 wysochanski 2009-07-26 14:37 wysochanski 2009-07-26 13:08 wysochanski 2009-07-26 13:07 wysochanski 2009-07-26 2:35 wysochanski 2009-07-26 2:35 wysochanski 2009-07-24 12:51 wysochanski 2009-07-23 23:40 wysochanski
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=20090724041531.7466.qmail@sourceware.org \ --to=wysochanski@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).