[PATCH] http-push: using error() and warning() as appropriate
- From
Miklos Vajna <vmiklos@frugalware.org>
- Date
- Feb 19, 2009, 12:07 UTC
- Message-ID
- <20090219120708.GM4371@genesis.frugalware.org>
- In-Reply-To
- <20090219081725.GB7774@coredump.intra.peff.net>
Change three occurrences of using inconsistent error/warning reporting by using the relevant error() / warning() calls to be consistent with the rest of the code.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> ---
On Thu, Feb 19, 2009 at 03:17:25AM -0500, Jeff King <peff@peff.net> wrote:
> http-push seems to be the odd man out. It contains one fprintf(stderr,
> "Error: ...") and one totally bogus error("Error: ..."), which will
> print "error: Error: ...". Perhaps it would be better to scan through
> the code and switch to using error() and warning() as appropriate.I found these 3 occurrences.
http-push.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/http-push.c b/http-push.c index 30d2d34..3a41d36 100644 --- a/http-push.c +++ b/http-push.c @@ -759,7 +759,7 @@ static void finish_request(struct transfer_request *request) } } else { if (request->http_code == 416) - fprintf(stderr, "Warning: requested range invalid; we may already have all the data.\n"); + warning("requested range invalid; we may already have all the data."); git_inflate_end(&request->stream); git_SHA1_Final(request->real_sha1, &request->c); @@ -1616,7 +1616,7 @@ static int locking_available(void) } XML_ParserFree(parser); if (!lock_flags) - error("Error: no DAV locking support on %s", + error("no DAV locking support on %s", remote->url); } else { @@ -2293,7 +2293,7 @@ int main(int argc, char **argv) if (info_ref_lock) remote->can_update_info_refs = 1; else { - fprintf(stderr, "Error: cannot lock existing info/refs\n"); + error("cannot lock existing info/refs"); rc = 1; goto cleanup; }
-- 1.6.1