sha1_name.c: use warning in preference to fprintf(stderr

This commit changes sha1_name.c to use warning instead of
fprintf(stderr).

Trailing newlines from message formats have been removed
since warning adds one itself.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_name.c b/sha1_name.c
index 90ad430a866cb4406a66250fb3a704b82b1ccfba..13209dc5b81c7de3cec109b9c9d17427893c066f 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -342,7 +342,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1);
 
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 {
 
 static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 {

-       static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
+       static const char *warn_msg = "refname '%.*s' is ambiguous.";

        char *real_ref = NULL;
        int refs_found = 0;
        int at, reflog_len;
        char *real_ref = NULL;
        int refs_found = 0;
        int at, reflog_len;


@@ -390,7 +390,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
                return -1;
 
        if (warn_ambiguous_refs && refs_found > 1)
                return -1;
 
        if (warn_ambiguous_refs && refs_found > 1)

-               fprintf(stderr, warning, len, str);
+               warning(warn_msg, len, str);

 
        if (reflog_len) {
                int nth, i;
 
        if (reflog_len) {
                int nth, i;


@@ -426,9 +426,8 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
                if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
                                &co_time, &co_tz, &co_cnt)) {
                        if (at_time)
                if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
                                &co_time, &co_tz, &co_cnt)) {
                        if (at_time)

-                               fprintf(stderr,
-                                       "warning: Log for '%.*s' only goes "
-                                       "back to %s.\n", len, str,
+                               warning("Log for '%.*s' only goes "
+                                       "back to %s.", len, str,

                                        show_date(co_time, co_tz, DATE_RFC2822));
                        else {
                                free(real_ref);
                                        show_date(co_time, co_tz, DATE_RFC2822));
                        else {
                                free(real_ref);