From mboxrd@z Thu Jan 1 00:00:00 1970 From: Johan Herland Subject: [PATCH 11/21] Rewrite error messages; fix up line lengths Date: Sat, 09 Jun 2007 02:17:17 +0200 Message-ID: <200706090217.17795.johan@herland.net> References: <7vzm3aig7j.fsf@assigned-by-dhcp.cox.net> <200706090210.36270.johan@herland.net> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7BIT Cc: Junio C Hamano , Johannes Schindelin To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Sat Jun 09 02:17:29 2007 Return-path: Envelope-to: gcvg-git@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Hwody-0004Lr-2h for gcvg-git@gmane.org; Sat, 09 Jun 2007 02:17:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032547AbXFIARY (ORCPT ); Fri, 8 Jun 2007 20:17:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1032533AbXFIARY (ORCPT ); Fri, 8 Jun 2007 20:17:24 -0400 Received: from smtp.getmail.no ([84.208.20.33]:34304 "EHLO smtp.getmail.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032507AbXFIARX (ORCPT ); Fri, 8 Jun 2007 20:17:23 -0400 Received: from pmxchannel-daemon.no-osl-m323-srv-004-z2.isp.get.no by no-osl-m323-srv-004-z2.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) id <0JJC00903E4YUC00@no-osl-m323-srv-004-z2.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:17:22 +0200 (CEST) Received: from smtp.getmail.no ([10.5.16.1]) by no-osl-m323-srv-004-z2.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JJC000OIE4UCO20@no-osl-m323-srv-004-z2.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:17:18 +0200 (CEST) Received: from alpha.herland ([84.210.6.167]) by no-osl-m323-srv-004-z1.isp.get.no (Sun Java System Messaging Server 6.2-7.05 (built Sep 5 2006)) with ESMTP id <0JJC0091EE4TAH10@no-osl-m323-srv-004-z1.isp.get.no> for git@vger.kernel.org; Sat, 09 Jun 2007 02:17:18 +0200 (CEST) In-reply-to: <200706090210.36270.johan@herland.net> Content-disposition: inline User-Agent: KMail/1.9.7 Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: Also update selftests to reflect new error messages. Signed-off-by: Johan Herland --- t/t3800-mktag.sh | 22 +++++++++++----------- tag.c | 44 +++++++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh index 0e87d2a..3bce5e0 100755 --- a/t/t3800-mktag.sh +++ b/t/t3800-mktag.sh @@ -49,7 +49,7 @@ tag mytag EOF cat >expect.pat <expect.pat <expect.pat <tag.sig printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig cat >expect.pat <expect.pat <expect.pat <expect.pat <expect.pat <expect.pat <expect.pat <expect.pat <= sizeof(type)) - return error("char" PD_FMT ": type too long", type_line + 5 - data); + return error("Tag object (@ char " PD_FMT "): " + "Type too long", type_line + 5 - data); memcpy(type, type_line + 5, type_len); type[type_len] = '\0'; @@ -115,16 +124,20 @@ int parse_and_verify_tag_buffer(struct tag *item, /* Verify that the object matches */ if (verify_object(sha1, type)) - return error("char%d: could not verify object %s", 7, sha1_to_hex(sha1)); + return error("Tag object (@ char 7): " + "Could not verify tagged object %s", + sha1_to_hex(sha1)); - /* Verify the tag-name: we don't allow control characters or spaces in it */ + /* Verify tag name: disallow control characters or spaces */ for (i = 4;;) { unsigned char c = tag_line[i++]; if (c == '\n') break; if (c > ' ') continue; - return error("char" PD_FMT ": could not verify tag name", tag_line + i - data); + return error("Tag object (@ char " PD_FMT "): " + "Could not verify tag name", + tag_line + i - data); } /* Verify the tagger line */ @@ -148,7 +161,8 @@ int parse_and_verify_tag_buffer(struct tag *item, } else if (!strcmp(type, tag_type)) { item->tagged = &lookup_tag(sha1)->object; } else { - error("Unknown type %s", type); + error("Tag object (@ char " PD_FMT "): " + "Unknown type '%s'", type_line + 5 - data, type); item->tagged = NULL; } -- 1.5.2