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>
Jon Seymour committed
Aug 24, 2010 at 14:52 UTC
eedce784a7492faa370fd96e372c948cba087965
1 file changed
+4
-5
sha1_name.c
+4
-5
@@ -342,7 +342,7 @@ static int get_sha1_1(const char *name, int len, unsigned char *sha1);
342
343
static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
344
{
345
- static const char *warning = "warning: refname '%.*s' is ambiguous.\n";
345
+ static const char *warn_msg = "refname '%.*s' is ambiguous.";
346
char *real_ref = NULL;
347
int refs_found = 0;
348
int at, reflog_len;
@@ -390,7 +390,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
390
return -1;
391
392
if (warn_ambiguous_refs && refs_found > 1)
393
- fprintf(stderr, warning, len, str);
393
+ warning(warn_msg, len, str);
394
395
if (reflog_len) {
396
int nth, i;
@@ -426,9 +426,8 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
426
if (read_ref_at(real_ref, at_time, nth, sha1, NULL,
427
&co_time, &co_tz, &co_cnt)) {
428
if (at_time)
429
- fprintf(stderr,
430
- "warning: Log for '%.*s' only goes "
431
- "back to %s.\n", len, str,
429
+ warning("Log for '%.*s' only goes "
430
+ "back to %s.", len, str,
431
show_date(co_time, co_tz, DATE_RFC2822));
432
else {
433
free(real_ref);