public inbox for patchutils-list@sourceware.org
 help / color / mirror / Atom feed
From: "Eli Carter" <eli.carter@commprove.com>
To: patchutils-list@sourceware.org
Subject: [PATCH] Minor error output cleanup
Date: Tue, 24 Oct 2006 15:25:00 -0000	[thread overview]
Message-ID: <56570.10.6.7.70.1161703463.squirrel@mail.ie.commprove.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

Tim,

In looking through interdiff.c I noticed that the errors for "Bad patch"
had two forms: "Bad patch #N" and "Bad patchN".  It's a minor thing.  The
attached (untested) patch changes "Bad patchN" to "Bad patch #N".

Comments?

Eli
eli.carter@commprove.com

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patchutils-errorstring-cleanup.patch --]
[-- Type: text/x-patch; name="patchutils-errorstring-cleanup.patch", Size: 1103 bytes --]

diff -urN --exclude=CVS patchutils-cvs/src/interdiff.c patchutils/src/interdiff.c
--- patchutils-cvs/src/interdiff.c	2005-05-11 10:21:47.000000000 -0500
+++ patchutils/src/interdiff.c	2006-10-24 10:19:25.000000000 -0500
@@ -714,15 +714,15 @@
 			oldnamelen = 0;
 		}
 		if (getline (&oldname, &oldnamelen, p1) < 0)
-			error (EXIT_FAILURE, errno, "Bad patch1");
+			error (EXIT_FAILURE, errno, "Bad patch #1");
 
 	} while (strncmp (oldname, "--- ", 4));
 	oldname[strlen (oldname) - 1] = '\0';
 
 	if (getline (&newname, &newnamelen, p1) < 0)
-		error (EXIT_FAILURE, errno, "Bad patch1");
+		error (EXIT_FAILURE, errno, "Bad patch #1");
 	if (strncmp (newname, "+++ ", 4))
-		error (EXIT_FAILURE, errno, "Bad patch1");
+		error (EXIT_FAILURE, errno, "Bad patch #1");
 	newname[strlen (newname) - 1] = '\0';
 	start = ftell (p1);
 
@@ -1019,7 +1019,7 @@
 			oldname = NULL;
 		}
 		if (getline (&oldname, &namelen, p1) < 0)
-			error (EXIT_FAILURE, errno, "Bad patch1");
+			error (EXIT_FAILURE, errno, "Bad patch #1");
 
 	} while (strncmp (oldname, "+++ ", 4));
 	oldname[strlen (oldname) - 1] = '\0';

             reply	other threads:[~2006-10-24 15:25 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-10-24 15:25 Eli Carter [this message]
2008-07-28  9:18 ` Tim Waugh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56570.10.6.7.70.1161703463.squirrel@mail.ie.commprove.com \
    --to=eli.carter@commprove.com \
    --cc=patchutils-list@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).