kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[PATCH] local-fetch.c: some error printing cleanup 

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Nicolas Pitre 2007-03-16 13:20:19 -04:00 committed by Junio C Hamano
parent 0d38ab259e
commit e8e91fece8
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
local-fetch.c
View File

@ -64,9 +64,9 @@ static int copy_file(const char *source, char *dest, const char *hex,
} }
/* If we got ENOENT there is no point continuing. */ /* If we got ENOENT there is no point continuing. */
if (errno == ENOENT) { if (errno == ENOENT) {
if (warn_if_not_exists) if (!warn_if_not_exists)
fprintf(stderr, "does not exist %s\n", source); return -1;
return -1; return error("does not exist %s", source);
} }
} }
if (use_symlink) { if (use_symlink) {
@ -74,9 +74,8 @@ static int copy_file(const char *source, char *dest, const char *hex,
if (stat(source, &st)) { if (stat(source, &st)) {
if (!warn_if_not_exists && errno == ENOENT) if (!warn_if_not_exists && errno == ENOENT)
return -1; return -1;
fprintf(stderr, "cannot stat %s: %s\n", source, return error("cannot stat %s: %s", source,
strerror(errno)); strerror(errno));
return -1;
} }
if (!symlink(source, dest)) { if (!symlink(source, dest)) {
pull_say("symlink %s\n", hex); pull_say("symlink %s\n", hex);
@ -90,25 +89,21 @@ static int copy_file(const char *source, char *dest, const char *hex,
if (ifd < 0) { if (ifd < 0) {
if (!warn_if_not_exists && errno == ENOENT) if (!warn_if_not_exists && errno == ENOENT)
return -1; return -1;
fprintf(stderr, "cannot open %s\n", source); return error("cannot open %s", source);
return -1;
} }
ofd = open(dest, O_WRONLY | O_CREAT | O_EXCL, 0666); ofd = open(dest, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (ofd < 0) { if (ofd < 0) {
fprintf(stderr, "cannot open %s\n", dest);
close(ifd); close(ifd);
return -1; return error("cannot open %s", dest);
} }
status = copy_fd(ifd, ofd); status = copy_fd(ifd, ofd);
close(ofd); close(ofd);
if (status) if (status)
fprintf(stderr, "cannot write %s\n", dest); return error("cannot write %s", dest);
else pull_say("copy %s\n", hex);
pull_say("copy %s\n", hex); return 0;
return status;
} }
fprintf(stderr, "failed to copy %s with given copy methods.\n", hex); return error("failed to copy %s with given copy methods.", hex);
return -1;
} }


static int fetch_pack(const unsigned char *sha1) static int fetch_pack(const unsigned char *sha1)
@ -181,13 +176,11 @@ int fetch_ref(char *ref, unsigned char *sha1)
ifd = open(filename, O_RDONLY); ifd = open(filename, O_RDONLY);
if (ifd < 0) { if (ifd < 0) {
close(ifd); close(ifd);
fprintf(stderr, "cannot open %s\n", filename); return error("cannot open %s", filename);
return -1;
} }
if (read_in_full(ifd, hex, 40) != 40 || get_sha1_hex(hex, sha1)) { if (read_in_full(ifd, hex, 40) != 40 || get_sha1_hex(hex, sha1)) {
close(ifd); close(ifd);
fprintf(stderr, "cannot read from %s\n", filename); return error("cannot read from %s", filename);
return -1;
} }
close(ifd); close(ifd);
pull_say("ref %s\n", sha1_to_hex(sha1)); pull_say("ref %s\n", sha1_to_hex(sha1));