@@ -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;
@@ -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;
@@ -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;
}
}
@@ -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;
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 <markmc@redhat.com> Cc: Avi Kivity <avi@redhat.com> Cc: Gerd Hoffmann <kraxel@redhat.com> --- hw/qdev.c | 2 +- qemu-config.c | 2 +- qemu-option.c | 6 +++--- vl.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)