From: "Marc-André Lureau" <marcandre.lureau@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@gmail.com>,
mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 03/12] qga: move string split in seperate function
Date: Wed, 1 Jul 2015 13:47:38 +0200 [thread overview]
Message-ID: <1435751267-26378-4-git-send-email-marcandre.lureau@gmail.com> (raw)
In-Reply-To: <1435751267-26378-1-git-send-email-marcandre.lureau@gmail.com>
The function is going to be reused in a later patch.
Signed-off-by: Marc-André Lureau <marcandre.lureau@gmail.com>
---
qga/main.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index af93992..0c455f8 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)
+{
+ 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
--
2.4.3
next prev parent reply other threads:[~2015-07-01 11:48 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-01 11:47 [Qemu-devel] [PATCH 00/12] qemu-ga: add a configuration file Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 01/12] qga: misc spelling Marc-André Lureau
2015-07-30 15:05 ` Eric Blake
2015-08-25 18:17 ` Denis V. Lunev
2015-07-01 11:47 ` [Qemu-devel] [PATCH 02/12] qga: use exit() when parsing options Marc-André Lureau
2015-07-31 14:34 ` Eric Blake
2015-08-25 20:20 ` Denis V. Lunev
2015-07-01 11:47 ` Marc-André Lureau [this message]
2015-08-25 15:50 ` [Qemu-devel] [PATCH 03/12] qga: move string split in seperate function Michael Roth
2015-07-01 11:47 ` [Qemu-devel] [PATCH 04/12] qga: rename 'path' to 'device_path' Marc-André Lureau
2015-08-25 15:55 ` Michael Roth
2015-08-25 22:00 ` Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 05/12] qga: copy argument strings Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 06/12] qga: move option parsing to seperate function Marc-André Lureau
2015-08-25 16:24 ` Michael Roth
2015-08-25 21:59 ` Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 07/12] qga: fill default options in main() Marc-André Lureau
2015-08-25 16:04 ` Michael Roth
2015-07-01 11:47 ` [Qemu-devel] [PATCH 08/12] qga: move agent run in a seperate function Marc-André Lureau
2015-08-25 16:51 ` Michael Roth
2015-08-25 21:59 ` Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 09/12] qga: free a bit more Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 10/12] qga: add --dump-conf option Marc-André Lureau
2015-08-25 17:11 ` Michael Roth
2015-08-25 21:58 ` Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 11/12] qga: add an optionnal qemu-ga.conf system configuration Marc-André Lureau
2015-07-01 11:47 ` [Qemu-devel] [PATCH 12/12] qga: start a man page Marc-André Lureau
2015-08-25 17:43 ` Michael Roth
2015-08-25 21:57 ` Marc-André Lureau
2015-07-29 13:41 ` [Qemu-devel] [PATCH 00/12] qemu-ga: add a configuration file Marc-André Lureau
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=1435751267-26378-4-git-send-email-marcandre.lureau@gmail.com \
--to=marcandre.lureau@gmail.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 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 NNTP newsgroup(s).