From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Jeff King" <peff@peff.net>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v2 36/41] sha1_file.c: use {error,die,warning}_errno()
Date: Tue, 3 May 2016 19:04:09 +0700 [thread overview]
Message-ID: <1462277054-5943-37-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1462277054-5943-1-git-send-email-pclouds@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
sha1_file.c | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index d0f2aa0..a7f45b3 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1107,9 +1107,8 @@ unsigned char *use_pack(struct packed_git *p,
PROT_READ, MAP_PRIVATE,
p->pack_fd, win->offset);
if (win->base == MAP_FAILED)
- die("packfile %s cannot be mapped: %s",
- p->pack_name,
- strerror(errno));
+ die_errno("packfile %s cannot be mapped",
+ p->pack_name);
if (!win->offset && win->len == p->pack_size
&& !p->do_not_close)
close_pack_fd(p);
@@ -1279,8 +1278,8 @@ static void prepare_packed_git_one(char *objdir, int local)
dir = opendir(path.buf);
if (!dir) {
if (errno != ENOENT)
- error("unable to open object pack directory: %s: %s",
- path.buf, strerror(errno));
+ error_errno("unable to open object pack directory: %s",
+ path.buf);
strbuf_release(&path);
return;
}
@@ -2984,7 +2983,7 @@ int finalize_object_file(const char *tmpfile, const char *filename)
unlink_or_warn(tmpfile);
if (ret) {
if (ret != EEXIST) {
- return error("unable to write sha1 filename %s: %s", filename, strerror(ret));
+ return error_errno("unable to write sha1 filename %s", filename);
}
/* FIXME!!! Collision check here ? */
}
@@ -2998,7 +2997,7 @@ out:
static int write_buffer(int fd, const void *buf, size_t len)
{
if (write_in_full(fd, buf, len) < 0)
- return error("file write error (%s)", strerror(errno));
+ return error_errno("file write error");
return 0;
}
@@ -3081,7 +3080,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
if (errno == EACCES)
return error("insufficient permission for adding an object to repository database %s", get_object_directory());
else
- return error("unable to create temporary file: %s", strerror(errno));
+ return error_errno("unable to create temporary file");
}
/* Set it up */
@@ -3126,8 +3125,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen,
utb.actime = mtime;
utb.modtime = mtime;
if (utime(tmp_file.buf, &utb) < 0)
- warning("failed utime() on %s: %s",
- tmp_file.buf, strerror(errno));
+ warning_errno("failed utime() on %s", tmp_file.buf);
}
return finalize_object_file(tmp_file.buf, filename);
@@ -3360,7 +3358,7 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
if (size == read_in_full(fd, buf, size))
ret = index_mem(sha1, buf, size, type, path, flags);
else
- ret = error("short read %s", strerror(errno));
+ ret = error_errno("short read");
free(buf);
} else {
void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
@@ -3425,18 +3423,14 @@ int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned
case S_IFREG:
fd = open(path, O_RDONLY);
if (fd < 0)
- return error("open(\"%s\"): %s", path,
- strerror(errno));
+ return error_errno("open(\"%s\")", path);
if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0)
return error("%s: failed to insert into database",
path);
break;
case S_IFLNK:
- if (strbuf_readlink(&sb, path, st->st_size)) {
- char *errstr = strerror(errno);
- return error("readlink(\"%s\"): %s", path,
- errstr);
- }
+ if (strbuf_readlink(&sb, path, st->st_size))
+ return error_errno("readlink(\"%s\")", path);
if (!(flags & HASH_WRITE_OBJECT))
hash_sha1_file(sb.buf, sb.len, blob_type, sha1);
else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1))
@@ -3492,7 +3486,7 @@ static int for_each_file_in_obj_subdir(int subdir_nr,
if (!dir) {
if (errno == ENOENT)
return 0;
- return error("unable to open %s: %s", path->buf, strerror(errno));
+ return error_errno("unable to open %s", path->buf);
}
while ((de = readdir(dir))) {
--
2.8.0.rc0.210.gd302cd2
next prev parent reply other threads:[~2016-05-03 12:10 UTC|newest]
Thread overview: 145+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-01 11:14 [PATCH 00/41] Add and use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:23 ` Eric Sunshine
2016-05-02 18:26 ` Junio C Hamano
2016-05-03 4:45 ` Jeff King
2016-05-03 9:39 ` Duy Nguyen
2016-05-03 10:15 ` Jeff King
2016-05-01 11:14 ` [PATCH 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:31 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 12/41] builtin/update-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:40 ` Eric Sunshine
2016-05-02 8:47 ` Duy Nguyen
2016-05-01 11:14 ` [PATCH 13/41] builtin/upload-archive.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 18:40 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-01 18:46 ` Eric Sunshine
2016-05-01 11:14 ` [PATCH 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 37/41] transport-helper.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-01 11:14 ` [PATCH 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-01 11:21 ` [PATCH 00/41] Add and use error_errno() and warning_errno() Duy Nguyen
2016-05-03 12:03 ` [PATCH v2 " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-03 19:22 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:48 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:54 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 19:58 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error Nguyễn Thái Ngọc Duy
2016-05-03 16:52 ` Eric Sunshine
2016-05-03 12:03 ` [PATCH v2 13/41] builtin/upload-archive.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-03 20:02 ` Junio C Hamano
2016-05-03 12:03 ` [PATCH v2 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:03 ` [PATCH v2 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` Nguyễn Thái Ngọc Duy [this message]
2016-05-03 12:04 ` [PATCH v2 37/41] transport-helper.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-03 12:04 ` [PATCH v2 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-03 16:55 ` [PATCH v2 00/41] Add and use error_errno() and warning_errno() Eric Sunshine
2016-05-03 20:11 ` Junio C Hamano
2016-05-08 9:47 ` [PATCH v3 " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 01/41] usage.c: move format processing out of die_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 02/41] usage.c: add warning_errno() and error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 03/41] bisect.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 04/41] builtin/am.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 05/41] builtin/branch.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 06/41] builtin/fetch.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 07/41] builtin/help.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 08/41] builtin/mailsplit.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 09/41] builtin/merge-file.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 10/41] builtin/pack-objects.c: use die_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 11/41] builtin/rm.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 12/41] builtin/update-index.c: prefer "err" to "errno" in process_lstat_error Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 13/41] builtin/upload-archive.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 14/41] builtin/worktree.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 15/41] check-racy.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 16/41] combine-diff.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 17/41] compat/win32/syslog.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 18/41] config.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 19/41] connected.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 20/41] copy.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 21/41] credential-cache--daemon.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 22/41] diff-no-index.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 23/41] editor.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 24/41] entry.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 25/41] fast-import.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 26/41] gpg-interface.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 27/41] grep.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 28/41] http.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 29/41] ident.c: use warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 30/41] mailmap.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 31/41] reachable.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 32/41] rerere.c: use error_errno() and warning_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 33/41] run-command.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 34/41] sequencer.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 35/41] server-info.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 37/41] transport-helper.c: use error_errno() Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 38/41] unpack-trees.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:47 ` [PATCH v3 39/41] upload-pack.c: " Nguyễn Thái Ngọc Duy
2016-05-08 9:48 ` [PATCH v3 40/41] vcs-svn: " Nguyễn Thái Ngọc Duy
2016-05-08 9:48 ` [PATCH v3 41/41] wrapper.c: use warning_errno() Nguyễn Thái Ngọc Duy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1462277054-5943-37-git-send-email-pclouds@gmail.com \
--to=pclouds@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).