summaryrefslogtreecommitdiff
path: root/sha1_file.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-23 01:47:10 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-23 03:10:26 (GMT)
commitbd2afde8a38b97391b22afebf15c583fb0fffacb (patch)
treed2a4357e278f350999c1d991533016231d237abb /sha1_file.c
parent6dc78e696b8597204b903073da932fc5ed0f419e (diff)
downloadgit-bd2afde8a38b97391b22afebf15c583fb0fffacb.zip
git-bd2afde8a38b97391b22afebf15c583fb0fffacb.tar.gz
git-bd2afde8a38b97391b22afebf15c583fb0fffacb.tar.bz2
Give no terminating LF to error() function.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'sha1_file.c')
-rw-r--r--sha1_file.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c
index f4b1089..aa09b46 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -564,7 +564,7 @@ static void prepare_packed_git_one(char *objdir, int local)
dir = opendir(path);
if (!dir) {
if (errno != ENOENT)
- error("unable to open object pack directory: %s: %s\n",
+ error("unable to open object pack directory: %s: %s",
path, strerror(errno));
return;
}
@@ -1513,7 +1513,8 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
local = mkstemp(tmpfile);
if (local < 0)
- return error("Couldn't open %s for %s\n", tmpfile, sha1_to_hex(sha1));
+ return error("Couldn't open %s for %s",
+ tmpfile, sha1_to_hex(sha1));
memset(&stream, 0, sizeof(stream));
@@ -1561,7 +1562,7 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
}
if (memcmp(sha1, real_sha1, 20)) {
unlink(tmpfile);
- return error("File %s has bad hash\n", sha1_to_hex(sha1));
+ return error("File %s has bad hash", sha1_to_hex(sha1));
}
return move_temp_to_file(tmpfile, sha1_file_name(sha1));