From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MqP2t-0003p1-Sn for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MqP2i-0003gn-3l for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:53 -0400 Received: from [199.232.76.173] (port=37811 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MqP2g-0003fk-Ka for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58714) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MqP2f-0001V6-Ha for qemu-devel@nongnu.org; Wed, 23 Sep 2009 06:25:45 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8NAPiFv020484 for ; Wed, 23 Sep 2009 06:25:44 -0400 From: Mark McLoughlin Date: Wed, 23 Sep 2009 11:24:05 +0100 Message-Id: <1253701463-3134-7-git-send-email-markmc@redhat.com> In-Reply-To: <1253701463-3134-1-git-send-email-markmc@redhat.com> References: <1253701463-3134-1-git-send-email-markmc@redhat.com> Subject: [Qemu-devel] [PATCH 06/24] Fix coding style issue List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Mark McLoughlin , Avi Kivity , Gerd Hoffmann Replace: if (-1 == foo()) with: if (foo() == -1) While this coding style is not in direct contravention of our currently ratified CODING_STYLE treaty, it could be argued that the Article 3 of the European Convention on Human Rights (prohibiting torture and "inhuman or degrading treatment") reads on the matter. [This commit message was brought to you without humour, as is evidenced by the absence of any emoticons] Signed-off-by: Mark McLoughlin Cc: Avi Kivity Cc: Gerd Hoffmann --- hw/qdev.c | 2 +- qemu-config.c | 2 +- qemu-option.c | 6 +++--- vl.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/qdev.c b/hw/qdev.c index 43b1beb..a589d72 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -137,7 +137,7 @@ static int set_property(const char *name, const char *value, void *opaque) if (strcmp(name, "bus") == 0) return 0; - if (-1 == qdev_prop_parse(dev, name, value)) { + if (qdev_prop_parse(dev, name, value) == -1) { qemu_error("can't set property \"%s\" to \"%s\" for \"%s\"\n", name, value, dev->info->name); return -1; diff --git a/qemu-config.c b/qemu-config.c index 39bf6a9..555c7ba 100644 --- a/qemu-config.c +++ b/qemu-config.c @@ -186,7 +186,7 @@ int qemu_set_option(const char *str) return -1; } - if (-1 == qemu_opt_set(opts, arg, str+offset+1)) { + if (qemu_opt_set(opts, arg, str+offset+1) == -1) { fprintf(stderr, "failed to set \"%s\" for %s \"%s\"\n", arg, lists[i]->name, id); return -1; diff --git a/qemu-option.c b/qemu-option.c index 88298e4..9fe1f95 100644 --- a/qemu-option.c +++ b/qemu-option.c @@ -267,7 +267,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, // Process parameter switch (list->type) { case OPT_FLAG: - if (-1 == parse_option_bool(name, value, &flag)) + if (parse_option_bool(name, value, &flag) == -1) return -1; list->value.n = flag; break; @@ -282,7 +282,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, break; case OPT_SIZE: - if (-1 == parse_option_size(name, value, &list->value.n)) + if (parse_option_size(name, value, &list->value.n) == -1) return -1; break; @@ -745,7 +745,7 @@ int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname } if (strcmp(option, "id") != 0) { /* store and parse */ - if (-1 == qemu_opt_set(opts, option, value)) { + if (qemu_opt_set(opts, option, value) == -1) { return -1; } } diff --git a/vl.c b/vl.c index f978944..4ebd242 100644 --- a/vl.c +++ b/vl.c @@ -5142,7 +5142,7 @@ int main(int argc, char **argv, char **envp) fprintf(stderr, "parse error: %s\n", optarg); exit(1); } - if (NULL == qemu_chr_open_opts(opts, NULL)) { + if (qemu_chr_open_opts(opts, NULL) == NULL) { exit(1); } break; -- 1.6.2.5