All of lore.kernel.org
 help / color / mirror / Atom feed
From: Brian Gesiak <modocache@gmail.com>
To: GIT Mailing-list <git@vger.kernel.org>
Cc: Brian Gesiak <modocache@gmail.com>
Subject: [PATCH 05/15] config.c: rearrange xcalloc arguments
Date: Tue, 27 May 2014 00:33:46 +0900	[thread overview]
Message-ID: <1401118436-66090-6-git-send-email-modocache@gmail.com> (raw)
In-Reply-To: <1401118436-66090-1-git-send-email-modocache@gmail.com>

xcalloc takes two arguments: the number of elements and their size.
config.c includes several calls to xcalloc that pass the arguments
in reverse order: the size of a struct lock_file*, followed by the
number to allocate. Rearrgange them so they are in the correct order.

Signed-off-by: Brian Gesiak <modocache@gmail.com>
---
 config.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.c b/config.c
index 314d8ee..c3612cc 100644
--- a/config.c
+++ b/config.c
@@ -1536,7 +1536,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
 	 * The lock serves a purpose in addition to locking: the new
 	 * contents of .git/config will be written into it.
 	 */
-	lock = xcalloc(sizeof(struct lock_file), 1);
+	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));
@@ -1791,7 +1791,7 @@ int git_config_rename_section_in_file(const char *config_filename,
 	if (!config_filename)
 		config_filename = filename_buf = git_pathdup("config");
 
-	lock = xcalloc(sizeof(struct lock_file), 1);
+	lock = xcalloc(1, sizeof(struct lock_file));
 	out_fd = hold_lock_file_for_update(lock, config_filename, 0);
 	if (out_fd < 0) {
 		ret = error("could not lock config file %s", config_filename);
-- 
2.0.0.rc1.543.gc8042da

  parent reply	other threads:[~2014-05-26 15:35 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-26 15:33 [PATCH 00/15] Rearrange xcalloc arguments Brian Gesiak
2014-05-26 15:33 ` [PATCH 01/15] builtin/add.c: rearrange " Brian Gesiak
2014-05-26 23:11   ` Jeremiah Mahler
2014-05-27  2:22     ` Brian Gesiak
2014-05-27  2:38       ` Jeremiah Mahler
2014-05-27  3:25   ` Eric Sunshine
2014-05-27 11:32     ` Brian Gesiak
2014-05-27 21:35       ` Eric Sunshine
2014-05-27 22:41         ` Junio C Hamano
2014-05-28  5:14         ` Jeremiah Mahler
2014-05-28  5:56           ` Brian Gesiak
2014-05-26 15:33 ` [PATCH 02/15] builtin/ls-remote.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 03/15] builtin/remote.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 04/15] commit.c: " Brian Gesiak
2014-05-26 15:33 ` Brian Gesiak [this message]
2014-05-26 15:33 ` [PATCH 06/15] diff.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 07/15] hash.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 08/15] hash.h: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 09/15] http-push.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 10/15] imap-send.c: " Brian Gesiak
2014-06-10 21:54   ` Jeremiah Mahler
2014-05-26 15:33 ` [PATCH 11/15] notes.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 12/15] pack-revindex.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 13/15] reflog-walk.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 14/15] remote.c: " Brian Gesiak
2014-05-26 15:33 ` [PATCH 15/15] transport-helper.c: " Brian Gesiak
2014-05-26 23:37 ` [PATCH 00/15] Rearrange " Jeremiah Mahler
2014-05-28  1:16   ` Jeff King

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1401118436-66090-6-git-send-email-modocache@gmail.com \
    --to=modocache@gmail.com \
    --cc=git@vger.kernel.org \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.