From patchwork Wed Jun 22 12:03:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 101439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 343ABB7035 for ; Wed, 22 Jun 2011 22:07:42 +1000 (EST) Received: from localhost ([::1]:44500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QZMDa-0007oi-Bl for incoming@patchwork.ozlabs.org; Wed, 22 Jun 2011 08:07:38 -0400 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 Received: from oxygen-old.pond.sub.org (unknown [IPv6:2a01:4f8:130:9021::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "oxygen.pond.sub.org", Issuer "CAcert Class 3 Root" (verified OK)) by oxygen.pond.sub.org (Postfix) with ESMTPS id F062FA2464; Wed, 22 Jun 2011 14:03:58 +0200 (CEST) Received: from blackfin.pond.sub.org (p5B32D44C.dip.t-dialin.net [91.50.212.76]) by oxygen-old.pond.sub.org (Postfix) with ESMTPA id AB6B2277189; Wed, 22 Jun 2011 14:03:58 +0200 (CEST) Received: by blackfin.pond.sub.org (Postfix, from userid 500) id 225132BC; Wed, 22 Jun 2011 14:03:58 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 22 Jun 2011 14:03:55 +0200 Message-Id: <1308744237-3468-4-git-send-email-armbru@redhat.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1308744237-3468-1-git-send-email-armbru@redhat.com> References: <1308744237-3468-1-git-send-email-armbru@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.46.104.156 Cc: stefanha@gmail.com Subject: [Qemu-devel] [PATCH trivial 3/5] qemu-img: Don't prepend qemu-img to error messages twice. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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':