[PATCH 05/15] config.c: rearrange xcalloc arguments
- From
Brian Gesiak <modocache@gmail.com>
- Date
- May 26, 2014, 15:33 UTC
- Message-ID
- <1401118436-66090-6-git-send-email-modocache@gmail.com>
- 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