From: "Denis V. Lunev" <den-lists@parallels.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com
Subject: Re: [Qemu-devel] [PATCH v3 03/12] qga: move string split in separate function
Date: Wed, 26 Aug 2015 20:55:12 +0300 [thread overview]
Message-ID: <55DDFD80.8000202@parallels.com> (raw)
In-Reply-To: <1440583525-21632-4-git-send-email-marcandre.lureau@redhat.com>
On 08/26/2015 01:05 PM, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The function is going to be reused in a later patch.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>
> ---
> qga/main.c | 33 ++++++++++++++++++++++-----------
> 1 file changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index 10bb2f7..e75022c 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -921,6 +921,26 @@ static void ga_print_cmd(QmpCommand *cmd, void *opaque)
> printf("%s\n", qmp_command_name(cmd));
> }
>
> +static GList *split_list(gchar *str, const gchar separator)
> +{
it would be much better to declare this helper as "split_list(const
gchar *str, ...
and make temporary copy of parameter inside. Without this the function
as NASTY side-effect and trashes the string passed in.
Also it is rather reinvents strtok wheel.
you can also use g_strsplit at your convenience, but may be this is overkill
> + GList *list = NULL;
> + int i, j, len;
> +
> + for (j = 0, i = 0, len = strlen(str); i < len; i++) {
> + if (str[i] == separator) {
> + str[i] = 0;
> + list = g_list_append(list, &str[j]);
> + j = i + 1;
> + }
> + }
> +
> + if (j < i) {
> + list = g_list_append(list, &str[j]);
> + }
> +
> + return list;
> +}
> +
> int main(int argc, char **argv)
> {
> const char *sopt = "hVvdm:p:l:f:F::b:s:t:";
> @@ -953,7 +973,7 @@ int main(int argc, char **argv)
> { "statedir", 1, NULL, 't' },
> { NULL, 0, NULL, 0 }
> };
> - int opt_ind = 0, ch, daemonize = 0, i, j, len;
> + int opt_ind = 0, ch, daemonize = 0;
> GLogLevelFlags log_level = G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL;
> GList *blacklist = NULL;
> GAState *s;
> @@ -1001,16 +1021,7 @@ int main(int argc, char **argv)
> qmp_for_each_command(ga_print_cmd, NULL);
> exit(EXIT_SUCCESS);
> }
> - for (j = 0, i = 0, len = strlen(optarg); i < len; i++) {
> - if (optarg[i] == ',') {
> - optarg[i] = 0;
> - blacklist = g_list_append(blacklist, &optarg[j]);
> - j = i + 1;
> - }
> - }
> - if (j < i) {
> - blacklist = g_list_append(blacklist, &optarg[j]);
> - }
> + blacklist = g_list_concat(blacklist, split_list(optarg, ','));
> break;
> }
> #ifdef _WIN32
next prev parent reply other threads:[~2015-08-26 17:55 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 10:05 [Qemu-devel] [PATCH v3 00/12] qemu-ga: add a configuration file marcandre.lureau
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 01/12] qga: misc spelling marcandre.lureau
2015-08-26 17:40 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 02/12] qga: use exit() when parsing options marcandre.lureau
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 03/12] qga: move string split in separate function marcandre.lureau
2015-08-26 17:55 ` Denis V. Lunev [this message]
2015-08-26 18:07 ` Marc-André Lureau
2015-08-26 18:23 ` Denis V. Lunev
2015-08-26 18:30 ` Marc-André Lureau
2015-08-26 18:33 ` Marc-André Lureau
2015-08-26 18:44 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 04/12] qga: rename 'path' to 'channel_path' marcandre.lureau
2015-08-26 17:56 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 05/12] qga: copy argument strings marcandre.lureau
2015-08-26 18:09 ` Denis V. Lunev
2015-08-26 18:17 ` Marc-André Lureau
2015-08-26 18:27 ` Denis V. Lunev
2015-08-26 18:41 ` Marc-André Lureau
2015-08-26 18:49 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 06/12] qga: move option parsing to separate function marcandre.lureau
2015-08-26 18:11 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 07/12] qga: fill default options in main() marcandre.lureau
2015-08-26 18:14 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 08/12] qga: move agent run in a separate function marcandre.lureau
2015-08-26 18:32 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 09/12] qga: free a bit more marcandre.lureau
2015-08-26 18:35 ` Denis V. Lunev
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 10/12] qga: add an optionnal qemu-ga.conf system configuration marcandre.lureau
2015-08-26 12:55 ` Eric Blake
2015-08-26 15:11 ` Marc-André Lureau
2015-08-26 15:17 ` Michael Roth
2015-08-26 18:41 ` Denis V. Lunev
2015-08-26 18:45 ` Marc-André Lureau
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 11/12] qga: add --dump-conf option marcandre.lureau
2015-08-26 19:00 ` Denis V. Lunev
2015-08-26 19:03 ` Marc-André Lureau
2015-08-26 10:05 ` [Qemu-devel] [PATCH v3 12/12] qga: start a man page marcandre.lureau
2015-08-26 19:08 ` Denis V. Lunev
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=55DDFD80.8000202@parallels.com \
--to=den-lists@parallels.com \
--cc=marcandre.lureau@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.