hook: fix minor style issues

Fix some minor style nits pointed out by Patrick, Junio and Eric:
  * Use CALLOC_ARRAY instead of xcalloc.
  * Init struct members during declaration.
  * Simplify if condition boolean logic.
  * Missing curly braces in if/else stmts.
  * Unnecessary header includes.
  * Capitalization and full-stop in error/warn messages.
  * Curly brace on separate line when defining struct.
  * Comment spelling: free'd -> freed.
  * Sort the included headers.
  * Blank line fixes to improve readability.

These contain no logic changes, the code behaves the same as before.

Suggested-by: Eric Sunshine <sunshine@sunshineco.com>
Suggested-by: Junio C Hamano <gitster@pobox.com>
Suggested-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/hook.c b/builtin/hook.c
index 83020dfb4fc57e775c6957f08ce0e44e03e4bf5b..e641614b84f28c15ac5448fcbbf78d30332e6434 100644 (file)
--- a/builtin/hook.c
+++ b/builtin/hook.c
@@ -5,8 +5,6 @@
 #include "gettext.h"
 #include "hook.h"
 #include "parse-options.h"
-#include "strvec.h"
-#include "abspath.h"
 
 #define BUILTIN_HOOK_RUN_USAGE \
        N_("git hook run [--ignore-missing] [--to-stdin=<path>] <hook-name> [-- <hook-args>]")
@@ -51,7 +49,7 @@ static int list(int argc, const char **argv, const char *prefix,
         * arguments later they probably should be caught by parse_options.
         */
        if (argc != 1)
-               usage_msg_opt(_("You must specify a hook event name to list."),
+               usage_msg_opt(_("you must specify a hook event name to list"),
                              builtin_hook_list_usage, list_options);
 
        hookname = argv[0];
@@ -59,7 +57,7 @@ static int list(int argc, const char **argv, const char *prefix,
        head = list_hooks(repo, hookname, NULL);
 
        if (!head->nr) {
-               warning(_("No hooks found for event '%s'"), hookname);
+               warning(_("no hooks found for event '%s'"), hookname);
                ret = 1; /* no hooks found */
                goto cleanup;
        }

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 63b2f7d54336402ae627b7de85b8634f6b0d8ce5..3385ad120f191fc948f6496cf1f361bc0f587860 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -3,46 +3,45 @@
 
 #include "builtin.h"
 #include "abspath.h"
-
+#include "commit.h"
+#include "commit-reach.h"
 #include "config.h"
+#include "connect.h"
+#include "connected.h"
 #include "environment.h"
+#include "exec-cmd.h"
+#include "fsck.h"
 #include "gettext.h"
+#include "gpg-interface.h"
 #include "hex.h"
-#include "lockfile.h"
-#include "pack.h"
-#include "refs.h"
-#include "pkt-line.h"
-#include "sideband.h"
-#include "run-command.h"
 #include "hook.h"
-#include "exec-cmd.h"
-#include "commit.h"
+#include "lockfile.h"
 #include "object.h"
-#include "remote.h"
-#include "connect.h"
-#include "string-list.h"
-#include "oid-array.h"
-#include "connected.h"
-#include "strvec.h"
-#include "version.h"
-#include "gpg-interface.h"
-#include "sigchain.h"
-#include "fsck.h"
-#include "tmp-objdir.h"
-#include "oidset.h"
-#include "packfile.h"
 #include "object-file.h"
 #include "object-name.h"
 #include "odb.h"
+#include "oid-array.h"
+#include "oidset.h"
+#include "pack.h"
+#include "packfile.h"
+#include "parse-options.h"
+#include "pkt-line.h"
 #include "protocol.h"
-#include "commit-reach.h"
+#include "refs.h"
+#include "remote.h"
+#include "run-command.h"
 #include "server-info.h"
+#include "setup.h"
+#include "shallow.h"
+#include "sideband.h"
+#include "sigchain.h"
+#include "string-list.h"
+#include "strvec.h"
+#include "tmp-objdir.h"
 #include "trace.h"
 #include "trace2.h"
+#include "version.h"
 #include "worktree.h"
-#include "shallow.h"
-#include "setup.h"
-#include "parse-options.h"
 
 static const char * const receive_pack_usage[] = {
        N_("git receive-pack <git-dir>"),
@@ -904,11 +903,14 @@ static int feed_receive_hook_cb(int hook_stdin_fd, void *pp_cb UNUSED, void *pp_
 static void *receive_hook_feed_state_alloc(void *feed_pipe_ctx)
 {
        struct receive_hook_feed_state *init_state = feed_pipe_ctx;
-       struct receive_hook_feed_state *data = xcalloc(1, sizeof(*data));
+       struct receive_hook_feed_state *data;
+
+       CALLOC_ARRAY(data, 1);
        data->report = init_state->report;
        data->cmd = init_state->cmd;
        data->skip_broken = init_state->skip_broken;
        strbuf_init(&data->buf, 0);
+
        return data;
 }
 
@@ -928,7 +930,11 @@ static int run_receive_hook(struct command *commands,
 {
        struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
        struct command *iter = commands;
-       struct receive_hook_feed_state feed_init_state = { 0 };
+       struct receive_hook_feed_state feed_init_state = {
+               .cmd = commands,
+               .skip_broken = skip_broken,
+               .buf = STRBUF_INIT,
+       };
        struct async sideband_async;
        int sideband_async_started = 0;
        int saved_stderr = -1;
@@ -961,9 +967,6 @@ static int run_receive_hook(struct command *commands,
        prepare_sideband_async(&sideband_async, &saved_stderr, &sideband_async_started);
 
        /* set up stdin callback */
-       feed_init_state.cmd = commands;
-       feed_init_state.skip_broken = skip_broken;
-       strbuf_init(&feed_init_state.buf, 0);
        opt.feed_pipe_ctx = &feed_init_state;
        opt.feed_pipe = feed_receive_hook_cb;
        opt.feed_pipe_cb_data_alloc = receive_hook_feed_state_alloc;

diff --git a/hook.c b/hook.c
index 67cc9a66df14305e16a72fe854379045647aaba5..935237fc1def150258e5d0b588025bbdcdd483e0 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -1,16 +1,16 @@
 #include "git-compat-util.h"
 #include "abspath.h"
 #include "advice.h"
+#include "config.h"
+#include "environment.h"
 #include "gettext.h"
 #include "hook.h"
-#include "path.h"
 #include "parse.h"
+#include "path.h"
 #include "run-command.h"
-#include "config.h"
+#include "setup.h"
 #include "strbuf.h"
 #include "strmap.h"
-#include "environment.h"
-#include "setup.h"
 
 const char *find_hook(struct repository *r, const char *name)
 {
@@ -57,9 +57,9 @@ static void hook_clear(struct hook *h, cb_data_free_fn cb_data_free)
        if (!h)
                return;
 
-       if (h->kind == HOOK_TRADITIONAL)
+       if (h->kind == HOOK_TRADITIONAL) {
                free((void *)h->u.traditional.path);
-       else if (h->kind == HOOK_CONFIGURED) {
+       } else if (h->kind == HOOK_CONFIGURED) {
                free((void *)h->u.configured.friendly_name);
                free((void *)h->u.configured.command);
        }
@@ -91,7 +91,7 @@ static void list_hooks_add_default(struct repository *r, const char *hookname,
        if (!hook_path)
                return;
 
-       h = xcalloc(1, sizeof(struct hook));
+       CALLOC_ARRAY(h, 1);
 
        /*
         * If the hook is to run in a specific dir, a relative path can
@@ -154,7 +154,7 @@ static int hook_config_lookup_all(const char *key, const char *value,
                                strmap_get(&data->event_hooks, value);
 
                        if (!hooks) {
-                               hooks = xcalloc(1, sizeof(*hooks));
+                               CALLOC_ARRAY(hooks, 1);
                                string_list_init_dup(hooks);
                                strmap_put(&data->event_hooks, value, hooks);
                        }
@@ -227,8 +227,9 @@ static void build_hook_config_map(struct repository *r, struct strmap *cache)
        /* Construct the cache from parsed configs. */
        strmap_for_each_entry(&cb_data.event_hooks, &iter, e) {
                struct string_list *hook_names = e->value;
-               struct string_list *hooks = xcalloc(1, sizeof(*hooks));
+               struct string_list *hooks;
 
+               CALLOC_ARRAY(hooks, 1);
                string_list_init_dup(hooks);
 
                for (size_t i = 0; i < hook_names->nr; i++) {
@@ -281,7 +282,7 @@ static struct strmap *get_hook_config_cache(struct repository *r)
                 * it just once on the first call.
                 */
                if (!r->hook_config_cache) {
-                       r->hook_config_cache = xcalloc(1, sizeof(*cache));
+                       CALLOC_ARRAY(r->hook_config_cache, 1);
                        strmap_init(r->hook_config_cache);
                        build_hook_config_map(r, r->hook_config_cache);
                }
@@ -289,9 +290,9 @@ static struct strmap *get_hook_config_cache(struct repository *r)
        } else {
                /*
                 * Out-of-repo calls (no gitdir) allocate and return a temporary
-                * map cache which gets free'd immediately by the caller.
+                * cache which gets freed immediately by the caller.
                 */
-               cache = xcalloc(1, sizeof(*cache));
+               CALLOC_ARRAY(cache, 1);
                strmap_init(cache);
                build_hook_config_map(r, cache);
        }
@@ -311,7 +312,9 @@ static void list_hooks_add_configured(struct repository *r,
        for (size_t i = 0; configured_hooks && i < configured_hooks->nr; i++) {
                const char *friendly_name = configured_hooks->items[i].string;
                const char *command = configured_hooks->items[i].util;
-               struct hook *hook = xcalloc(1, sizeof(struct hook));
+               struct hook *hook;
+
+               CALLOC_ARRAY(hook, 1);
 
                if (options && options->feed_pipe_cb_data_alloc)
                        hook->feed_pipe_cb_data =
@@ -343,7 +346,7 @@ struct string_list *list_hooks(struct repository *r, const char *hookname,
        if (!hookname)
                BUG("null hookname was provided to hook_list()!");
 
-       hook_head = xmalloc(sizeof(struct string_list));
+       CALLOC_ARRAY(hook_head, 1);
        string_list_init_dup(hook_head);
 
        /* Add hooks from the config, e.g. hook.myhook.event = pre-commit */
@@ -493,8 +496,7 @@ int run_hooks_opt(struct repository *r, const char *hook_name,
         * Ensure cb_data copy and free functions are either provided together,
         * or neither one is provided.
         */
-       if ((options->feed_pipe_cb_data_alloc && !options->feed_pipe_cb_data_free) ||
-           (!options->feed_pipe_cb_data_alloc && options->feed_pipe_cb_data_free))
+       if (!options->feed_pipe_cb_data_alloc != !options->feed_pipe_cb_data_free)
                BUG("feed_pipe_cb_data_alloc and feed_pipe_cb_data_free must be set together");
 
        if (options->invoked_hook)

diff --git a/hook.h b/hook.h
index e949f5d4888cd45bb09c063d707a83edf9678714..1c447cbb6be83b8e98aa95bf748cfe756c266189 100644 (file)
--- a/hook.h
+++ b/hook.h
@@ -1,9 +1,9 @@
 #ifndef HOOK_H
 #define HOOK_H
-#include "strvec.h"
 #include "run-command.h"
 #include "string-list.h"
 #include "strmap.h"
+#include "strvec.h"
 
 struct repository;
 
@@ -46,8 +46,7 @@ struct hook {
 typedef void (*cb_data_free_fn)(void *data);
 typedef void *(*cb_data_alloc_fn)(void *init_ctx);
 
-struct run_hooks_opt
-{
+struct run_hooks_opt {
        /* Environment vars to be set for each hook */
        struct strvec env;
 

diff --git a/refs.c b/refs.c
index a3363518e81690f9288d76a7cee2fd805baf5119..bd91c5c8824fc338f33fde33103ebba7271f0f85 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -2599,7 +2599,8 @@ static int transaction_hook_feed_stdin(int hook_stdin_fd, void *pp_cb, void *pp_
 
 static void *transaction_feed_cb_data_alloc(void *feed_pipe_ctx UNUSED)
 {
-       struct transaction_feed_cb_data *data = xmalloc(sizeof(*data));
+       struct transaction_feed_cb_data *data;
+       CALLOC_ARRAY(data, 1);
        strbuf_init(&data->buf, 0);
        data->index = 0;
        return data;

diff --git a/t/t1800-hook.sh b/t/t1800-hook.sh
index b1583e9ef9ac5702403f1d88bc0ad45cbaf68a5d..952bf97b86477cce8b30504e7836c7afe91b70e7 100755 (executable)
--- a/t/t1800-hook.sh
+++ b/t/t1800-hook.sh
@@ -34,7 +34,7 @@ test_expect_success 'git hook usage' '
 
 test_expect_success 'git hook list: nonexistent hook' '
        cat >stderr.expect <<-\EOF &&
-       warning: No hooks found for event '\''test-hook'\''
+       warning: no hooks found for event '\''test-hook'\''
        EOF
        test_expect_code 1 git hook list test-hook 2>stderr.actual &&
        test_cmp stderr.expect stderr.actual

diff --git a/transport.c b/transport.c
index 107f4fa5dce96adb4afbaba4fcf5bb5f9eb80b4c..56a4015389ef2570ab78c3b6131de762dc0e9341 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -1360,7 +1360,8 @@ static int pre_push_hook_feed_stdin(int hook_stdin_fd, void *pp_cb UNUSED, void
 
 static void *pre_push_hook_data_alloc(void *feed_pipe_ctx)
 {
-       struct feed_pre_push_hook_data *data = xmalloc(sizeof(*data));
+       struct feed_pre_push_hook_data *data;
+       CALLOC_ARRAY(data, 1);
        strbuf_init(&data->buf, 0);
        data->refs = (struct ref *)feed_pipe_ctx;
        return data;