aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-12-18 16:35:27 +0100
committerMarkus Armbruster <armbru@redhat.com>2016-01-13 15:16:19 +0100
commit533fdaedeb7f7ae90866312f57249ebbb7e3c97f (patch)
treeada9b99a39c08b7df0b9f5cd20b2df0f3f3fb4e6 /contrib
parent24da21f265b091dee756398a24d63dd8a2f3d5ab (diff)
downloadqemu-533fdaedeb7f7ae90866312f57249ebbb7e3c97f.zip
qemu-533fdaedeb7f7ae90866312f57249ebbb7e3c97f.tar.gz
qemu-533fdaedeb7f7ae90866312f57249ebbb7e3c97f.tar.bz2
error: Consistently name Error * objects err, and not errp
Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1450452927-8346-25-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/ivshmem-server/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index 00508b5..9b0d6e2 100644
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -65,7 +65,7 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int argc, char *argv[])
{
int c;
unsigned long long v;
- Error *errp = NULL;
+ Error *err = NULL;
while ((c = getopt(argc, argv,
"h" /* help */
@@ -104,9 +104,9 @@ ivshmem_server_parse_args(IvshmemServerArgs *args, int argc, char *argv[])
break;
case 'l': /* shm_size */
- parse_option_size("shm_size", optarg, &args->shm_size, &errp);
- if (errp) {
- error_report_err(errp);
+ parse_option_size("shm_size", optarg, &args->shm_size, &err);
+ if (err) {
+ error_report_err(err);
ivshmem_server_usage(argv[0], 1);
}
break;