From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:32890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZMAC-0007my-DR for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:04:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QZMA7-0005Us-Rm for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:04:08 -0400 Received: from oxygen.pond.sub.org ([78.46.104.156]:50618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZMA7-0005Ts-0k for qemu-devel@nongnu.org; Wed, 22 Jun 2011 08:04:03 -0400 From: Markus Armbruster Date: Wed, 22 Jun 2011 14:03:55 +0200 Message-Id: <1308744237-3468-4-git-send-email-armbru@redhat.com> In-Reply-To: <1308744237-3468-1-git-send-email-armbru@redhat.com> References: <1308744237-3468-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: stefanha@gmail.com error_report() prepends the location already. Example: $ qemu-img convert -6 qemu-img: qemu-img: option -6 is deprecated, please use '-o compat6' instead! Signed-off-by: Markus Armbruster --- qemu-img.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 1a37828..32628b3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -304,11 +304,11 @@ static int img_create(int argc, char **argv) fmt = optarg; break; case 'e': - error_report("qemu-img: option -e is deprecated, please use \'-o " + error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); return 1; case '6': - error_report("qemu-img: option -6 is deprecated, please use \'-o " + error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); return 1; case 'o': @@ -633,11 +633,11 @@ static int img_convert(int argc, char **argv) compress = 1; break; case 'e': - error_report("qemu-img: option -e is deprecated, please use \'-o " + error_report("option -e is deprecated, please use \'-o " "encryption\' instead!"); return 1; case '6': - error_report("qemu-img: option -6 is deprecated, please use \'-o " + error_report("option -6 is deprecated, please use \'-o " "compat6\' instead!"); return 1; case 'o': -- 1.7.2.3