提交 3df04ac3 编写于 作者: M Mark McLoughlin 提交者: Blue Swirl

Fix coding style issue

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: NMark McLoughlin <markmc@redhat.com>
Cc: Avi Kivity <avi@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 9262f384
...@@ -137,7 +137,7 @@ static int set_property(const char *name, const char *value, void *opaque) ...@@ -137,7 +137,7 @@ static int set_property(const char *name, const char *value, void *opaque)
if (strcmp(name, "bus") == 0) if (strcmp(name, "bus") == 0)
return 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", qemu_error("can't set property \"%s\" to \"%s\" for \"%s\"\n",
name, value, dev->info->name); name, value, dev->info->name);
return -1; return -1;
......
...@@ -186,7 +186,7 @@ int qemu_set_option(const char *str) ...@@ -186,7 +186,7 @@ int qemu_set_option(const char *str)
return -1; 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", fprintf(stderr, "failed to set \"%s\" for %s \"%s\"\n",
arg, lists[i]->name, id); arg, lists[i]->name, id);
return -1; return -1;
......
...@@ -267,7 +267,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, ...@@ -267,7 +267,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
// Process parameter // Process parameter
switch (list->type) { switch (list->type) {
case OPT_FLAG: case OPT_FLAG:
if (-1 == parse_option_bool(name, value, &flag)) if (parse_option_bool(name, value, &flag) == -1)
return -1; return -1;
list->value.n = flag; list->value.n = flag;
break; break;
...@@ -282,7 +282,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name, ...@@ -282,7 +282,7 @@ int set_option_parameter(QEMUOptionParameter *list, const char *name,
break; break;
case OPT_SIZE: 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; return -1;
break; break;
...@@ -745,7 +745,7 @@ int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname ...@@ -745,7 +745,7 @@ int qemu_opts_do_parse(QemuOpts *opts, const char *params, const char *firstname
} }
if (strcmp(option, "id") != 0) { if (strcmp(option, "id") != 0) {
/* store and parse */ /* store and parse */
if (-1 == qemu_opt_set(opts, option, value)) { if (qemu_opt_set(opts, option, value) == -1) {
return -1; return -1;
} }
} }
......
...@@ -5142,7 +5142,7 @@ int main(int argc, char **argv, char **envp) ...@@ -5142,7 +5142,7 @@ int main(int argc, char **argv, char **envp)
fprintf(stderr, "parse error: %s\n", optarg); fprintf(stderr, "parse error: %s\n", optarg);
exit(1); exit(1);
} }
if (NULL == qemu_chr_open_opts(opts, NULL)) { if (qemu_chr_open_opts(opts, NULL) == NULL) {
exit(1); exit(1);
} }
break; break;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册