@matheusbsbs / matheus-bagliano / commits / f0c6b6467d
Fork 0

submodule: fix style in function definition

The definitions of 'verify_submodule_committish()' and 'print_submodule_summary()' had wrong styling in terms of the asterisk placement. Amend them. Also, the warning printed in case of an unexpected file mode printed the mode in decimal. Print it in octal for enhanced readability. Reported-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Shourya Shukla committed Aug 25, 2020 at 17:00 UTC f0c6b6467d60d9c8442ebf4a4b4bd53ebc9bcb4e
1 file changed +3 -3
builtin/submodule--helper.c
+3 -3
@@ -959,7 +959,7 @@ enum diff_cmd {
959 DIFF_FILES
960 };
961
962 -static char* verify_submodule_committish(const char *sm_path,
962 +static char *verify_submodule_committish(const char *sm_path,
963 const char *committish)
964 {
965 struct child_process cp_rev_parse = CHILD_PROCESS_INIT;
@@ -979,7 +979,7 @@ static char* verify_submodule_committish(const char *sm_path,
979 return strbuf_detach(&result, NULL);
980 }
981
982 -static void print_submodule_summary(struct summary_cb *info, char* errmsg,
982 +static void print_submodule_summary(struct summary_cb *info, char *errmsg,
983 int total_commits, const char *displaypath,
984 const char *src_abbrev, const char *dst_abbrev,
985 struct module_cb *p)
@@ -1056,7 +1056,7 @@ static void generate_submodule_summary(struct summary_cb *info,
1056 } else {
1057 /* for a submodule removal (mode:0000000), don't warn */
1058 if (p->mod_dst)
1059 - warning(_("unexpected mode %d\n"), p->mod_dst);
1059 + warning(_("unexpected mode %o\n"), p->mod_dst);
1060 }
1061 }
1062