http-push: using error() and warning() as appropriate

Change three occurences of using inconsistent error/warning reporting by
using the relevant error() / warning() calls to be consitent with the
rest of the code.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/http-push.c b/http-push.c
index 48e5f38fe0f8848ffe0941d48eae10b8edc14dd8..e6bd01a516082985637eba3eaaab629e5ab5fef8 100644 (file)
--- 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)
                        }
                } 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);
 
                        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)
                        }
                        XML_ParserFree(parser);
                        if (!lock_flags)

-                               error("Error: no DAV locking support on %s",
+                               error("no DAV locking support on %s",

                                      remote->url);
 
                } else {
                                      remote->url);
 
                } else {


@@ -2225,7 +2225,7 @@ int main(int argc, char **argv)
                if (info_ref_lock)
                        remote->can_update_info_refs = 1;
                else {
                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;
                }
                        rc = 1;
                        goto cleanup;
                }