From patchwork Tue Aug 25 22:10:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 510641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BC6D11401EF for ; Wed, 26 Aug 2015 08:12:21 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=aW5qe17E; dkim-atps=neutral Received: from localhost ([::1]:34863 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMS3-0000j6-MW for incoming@patchwork.ozlabs.org; Tue, 25 Aug 2015 18:12:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQP-0006RB-Sg for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZUMQO-0002XH-UE for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:37 -0400 Received: from mail-qk0-x236.google.com ([2607:f8b0:400d:c09::236]:34788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZUMQO-0002X7-9e for qemu-devel@nongnu.org; Tue, 25 Aug 2015 18:10:36 -0400 Received: by qkfh127 with SMTP id h127so109475756qkf.1 for ; Tue, 25 Aug 2015 15:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=kJjU7vhbYdykQjoZmG4eAhzbcx2QTkA6PSyg6KrRK1E=; b=aW5qe17ECnzdCs8hMdQP/9KRVx7yFYi/RxdDffjTdlWEMS0KcYQzCUhVVUo477J7ku UNOuxsNJd9/TptbUrSPIx9afd5rUIrF1+ytwOZYbpUEv0AGkUbwpMmqTWw7smpofNzRv 363cNKapV8vUn0bZg3GZzTqPA5fabLJ+kzFm1zvcUCLni+VappjiyaJotxYV5MuP5aWq gCCu2ZQCPZPAhd38CbXNBpjN00niEnPcQ6An5gSCsMgpd8Oc4gzMsm30flgWGuxBqoaa Q/vA0xAck6r+YAx52XQxJmue9VMmJf1oi/c6YVeM0R2qW0toWCz/q9ryoKFB9ccaFVZ0 3ljA== X-Received: by 10.55.18.214 with SMTP id 83mr19859633qks.7.1440540635831; Tue, 25 Aug 2015 15:10:35 -0700 (PDT) Received: from localhost (bne75-h02-31-39-163-232.dsl.sta.abo.bbox.fr. [31.39.163.232]) by smtp.gmail.com with ESMTPSA id s107sm9600093qge.35.2015.08.25.15.10.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Aug 2015 15:10:35 -0700 (PDT) From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Date: Wed, 26 Aug 2015 00:10:15 +0200 Message-Id: <1440540624-7998-4-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> References: <1440540624-7998-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c09::236 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH v2 03/12] qga: move string split in separate function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Marc-André Lureau The function is going to be reused in a later patch. Signed-off-by: Marc-André Lureau Reviewed-by: Michael Roth --- 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) +{ + 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