git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Eric Sunshine" <sunshine@sunshineco.com>,
	"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH v3 18/41] config.c: use error_errno()
Date: Sun,  8 May 2016 16:47:38 +0700	[thread overview]
Message-ID: <1462700881-25108-19-git-send-email-pclouds@gmail.com> (raw)
In-Reply-To: <1462700881-25108-1-git-send-email-pclouds@gmail.com>

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 config.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/config.c b/config.c
index 10b5c95..80411e4 100644
--- a/config.c
+++ b/config.c
@@ -2012,7 +2012,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 	lock = xcalloc(1, sizeof(struct lock_file));
 	fd = hold_lock_file_for_update(lock, config_filename, 0);
 	if (fd < 0) {
-		error("could not lock config file %s: %s", config_filename, strerror(errno));
+		error_errno("could not lock config file %s", config_filename);
 		free(store.key);
 		ret = CONFIG_NO_LOCK;
 		goto out_free;
@@ -2026,8 +2026,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		free(store.key);
 
 		if ( ENOENT != errno ) {
-			error("opening %s: %s", config_filename,
-			      strerror(errno));
+			error_errno("opening %s", config_filename);
 			ret = CONFIG_INVALID_FILE; /* same as "invalid config file" */
 			goto out_free;
 		}
@@ -2111,8 +2110,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		if (contents == MAP_FAILED) {
 			if (errno == ENODEV && S_ISDIR(st.st_mode))
 				errno = EISDIR;
-			error("unable to mmap '%s': %s",
-			      config_filename, strerror(errno));
+			error_errno("unable to mmap '%s'", config_filename);
 			ret = CONFIG_INVALID_FILE;
 			contents = NULL;
 			goto out_free;
@@ -2121,8 +2119,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		in_fd = -1;
 
 		if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
-			error("chmod on %s failed: %s",
-			      get_lock_file_path(lock), strerror(errno));
+			error_errno("chmod on %s failed", get_lock_file_path(lock));
 			ret = CONFIG_NO_WRITE;
 			goto out_free;
 		}
@@ -2178,8 +2175,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 	}
 
 	if (commit_lock_file(lock) < 0) {
-		error("could not write config file %s: %s", config_filename,
-		      strerror(errno));
+		error_errno("could not write config file %s", config_filename);
 		ret = CONFIG_NO_WRITE;
 		lock = NULL;
 		goto out_free;
@@ -2330,8 +2326,8 @@ int git_config_rename_section_in_file(const char *config_filename,
 	fstat(fileno(config_file), &st);
 
 	if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
-		ret = error("chmod on %s failed: %s",
-			    get_lock_file_path(lock), strerror(errno));
+		ret = error_errno("chmod on %s failed",
+				  get_lock_file_path(lock));
 		goto out;
 	}
 
@@ -2385,8 +2381,8 @@ int git_config_rename_section_in_file(const char *config_filename,
 	fclose(config_file);
 unlock_and_out:
 	if (commit_lock_file(lock) < 0)
-		ret = error("could not write config file %s: %s",
-			    config_filename, strerror(errno));
+		ret = error_errno("could not write config file %s",
+				  config_filename);
 out:
 	free(filename_buf);
 	return ret;
-- 
2.8.0.rc0.210.gd302cd2

  parent reply	other threads:[~2016-05-08  9:50 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   ` [PATCH v2 36/41] sha1_file.c: use {error,die,warning}_errno() Nguyễn Thái Ngọc Duy
2016-05-03 12:04   ` [PATCH v2 37/41] transport-helper.c: use error_errno() 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     ` Nguyễn Thái Ngọc Duy [this message]
2016-05-08  9:47     ` [PATCH v3 19/41] connected.c: use error_errno() 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=1462700881-25108-19-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).