From 533fdaedeb7f7ae90866312f57249ebbb7e3c97f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 18 Dec 2015 16:35:27 +0100 Subject: error: Consistently name Error * objects err, and not errp Signed-off-by: Markus Armbruster Message-Id: <1450452927-8346-25-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- contrib/ivshmem-server/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'contrib') 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; -- cgit v1.1