From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAcy-0006s3-CH for qemu-devel@nongnu.org; Thu, 30 May 2013 17:43:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UiAct-000781-Cw for qemu-devel@nongnu.org; Thu, 30 May 2013 17:43:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49853) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UiAct-00077w-59 for qemu-devel@nongnu.org; Thu, 30 May 2013 17:43:15 -0400 Message-ID: <51A7C7EF.6040109@redhat.com> Date: Thu, 30 May 2013 15:43:11 -0600 From: Eric Blake MIME-Version: 1.0 References: <1369907728-4175-1-git-send-email-wdongxu@linux.vnet.ibm.com> <1369907728-4175-4-git-send-email-wdongxu@linux.vnet.ibm.com> In-Reply-To: <1369907728-4175-4-git-send-email-wdongxu@linux.vnet.ibm.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2NTVIBSDWGJLXFCPWLJAP" Subject: Re: [Qemu-devel] [PATCH V15 3/6] Create four QemuOptsList related functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dongxu Wang Cc: qemu-devel@nongnu.org, armbru@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2NTVIBSDWGJLXFCPWLJAP Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 05/30/2013 03:55 AM, Dongxu Wang wrote: > From: Dong Xu Wang >=20 > This patch will create 4 functions, count_opts_list, qemu_opts_append, s/will create/creates/ - commit messages make the most sense when written in present tense > qemu_opts_free and qemu_opts_print_help, they will be used in following= > commits. >=20 Again, this portion... > v12->v13: > 1) simply assert that neither argument has merge_lists set. > 2) drop superfluous paranthesesis around p =3D=3D first. >=20 > v11->v12: > 1) renmae functions. > 2) fix loop styles and code styles. > 3) qemu_opts_apend will not return NULL now. > 4) merge_lists value is from arguments in qemu_opts_append. >=20 > v6->v7: > 1) Fix typo. >=20 > v5->v6: > 1) allocate enough space in append_opts_list function. =2E..belongs after '---', and >=20 > Signed-off-by: Dong Xu Wang > Signed-off-by: Dongxu Wang your s-o-b is unusual. > + > +static size_t count_opts_list(QemuOptsList *list) > +{ > + size_t i =3D 0; > + > + for (i =3D 0; list && list->desc[i].name; i++) { No need to initialize i to 0 in two places. > + ; > + } > + > + return i; > +} > + > +/* Create a new QemuOptsList and make its desc to the merge of first > + * and second. It will allocate space for one new QemuOptsList plus > + * enough space for QemuOptDesc in first and second QemuOptsList. > + * First argument's QemuOptDesc members take precedence over second's.= > + * The result's name and implied_opt_name are not copied from them. > + * Both merge_lists should not be set. Both list can be NULL. > + */ > +QemuOptsList *qemu_opts_append(QemuOptsList *first, > + QemuOptsList *second) > +{ > + size_t num_first_opts, num_second_opts; > + QemuOptsList *dest =3D NULL; > + int i =3D 0; > + int index =3D 0; > + QemuOptsList *p =3D first; > + > + num_first_opts =3D count_opts_list(first); > + num_second_opts =3D count_opts_list(second); > + > + dest =3D g_malloc0(sizeof(QemuOptsList) > + + (num_first_opts + num_second_opts + 1) * sizeof(QemuOptDesc)= ); > + > + dest->name =3D "append_opts_list"; > + dest->implied_opt_name =3D NULL; > + assert((!first || !first->merge_lists) > + && (!second || !second->merge_lists)); > + QTAILQ_INIT(&dest->head); > + > + for (i =3D 0; p && p->desc[i].name; i++) { Again, a double-initialization of i [1] > + if (!find_desc_by_name(dest->desc, p->desc[i].name)) { > + dest->desc[index].name =3D g_strdup(p->desc[i].name); > + dest->desc[index].help =3D g_strdup(p->desc[i].help); > + dest->desc[index].type =3D p->desc[i].type; > + dest->desc[index].def_value_str =3D > + g_strdup(p->desc[i].def_value_str); Do we really have to strdup these elements, or are we guaranteed that the scope of the original first/second list is always larger than the scope of the merged list, and can thus share the existing pointer rather than creating copies? [2] > + index++; > + } > + if (p =3D=3D first && p && !p->desc[i].name) { > + p =3D second; > + i =3D 0; > + } > + } > + dest->desc[index].name =3D NULL; > + return dest; > +} > + > +/* free a QemuOptsList, can accept NULL as arguments */ > +void qemu_opts_free(QemuOptsList *list) > +{ > + int i =3D 0; > + > + for (i =3D 0; list && list->desc[i].name; i++) { [1] and again for double initialization of i > + g_free((char *)list->desc[i].name); > + g_free((char *)list->desc[i].help); > + g_free((char *)list->desc[i].def_value_str); [2] The fact that you have to cast away const is a sign that maybe you shouldn't be storing strdup'd data in these pointers in the first place. > + } > + > + g_free(list); > +} > + > +void qemu_opts_print_help(QemuOptsList *list) > +{ > + int i =3D 0; > + printf("Supported options:\n"); > + for (i =3D 0; list && list->desc[i].name; i++) { [1] and another > + printf("%-16s %s\n", list->desc[i].name, > + list->desc[i].help ? > + list->desc[i].help : "No description available"); > + } > +} >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org ------enig2NTVIBSDWGJLXFCPWLJAP Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (GNU/Linux) Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJRp8fvAAoJEKeha0olJ0Nq9mkH/iyeOwIn9VlflNQJhflcJq/C WtubabxGI/zCJiI7YwqwO5H5r98gjmkSNGEND0UHhGYwdPNf0Tzikh5F3/gEpC8J YVuOPNpkcm06BGRzS0yK8RjHwgQB44YTreHUA3+ngiHek/HopVxMPK9j8YxtpFF/ UY/m24J6xVatOnoJNfXB6nDvLcEXzrZZ96mvrlVCifa8/g3/FubW/Ol3gsV+Wtd4 aw70ZAVaLod/ima8v2CwbsiDIRTHOYcmU1xBI2ZxcXSDMxeAIU8YTOtXrE7zNob7 lzXilIXJo9p59xondKFhRtfH7lppKdOkvHty4AgIshAxSs16MBVe/jGhJZzZ8pE= =OzIB -----END PGP SIGNATURE----- ------enig2NTVIBSDWGJLXFCPWLJAP--