style: the opening '{' of a function is in a separate line
PATCH 1/1 style: the opening '{' of a function is in a separate line
Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>
--- bisect.c | 3 ++- builtin/config.c | 3 ++- builtin/push.c | 4 +++- convert.c | 3 ++- credential-cache--daemon.c | 3 ++- diff.c | 6 ++++-- git.c | 3 ++- imap-send.c | 3 ++- remote-curl.c | 3 ++- sequencer.c | 6 ++++-- string-list.c | 3 ++- t/helper/test-sigchain.c | 3 ++- transport-helper.c | 3 ++- url.c | 3 ++- userdiff.c | 3 ++- 15 files changed, 35 insertions(+), 17 deletions(-)
bisect.c +2 -1
@@ -558,7 +558,8 @@ struct commit_list *filter_skipped(struct commit_list *list,* is increased by one between each call, but that should not matter * for this application. */ -static unsigned get_prn (unsigned count) { +static unsigned get_prn (unsigned count) +{ count = count *1103515245 +12345 ;return (count/65536 ) %PRN_MODULO ; }
builtin/config.c +2 -1
@@ -164,7 +164,8 @@ static NORETURN void usage_builtin_config(void)usage_with_options (builtin_config_usage, builtin_config_options); } -static void check_argc (int argc,int min,int max) { +static void check_argc (int argc,int min,int max) +{if (argc >= min && argc <= max)return ;if (min == max)
builtin/push.c +3 -1
@@ -143,7 +143,9 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)return remote->url_nr; } -static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) { +static NORETURN int die_push_simple(struct branch *branch, +struct remote *remote) +{/* * There's no point in using shorten_unambiguous_ref here, * as the ambiguity would be on the remote side, not what
convert.c +2 -1
@@ -778,7 +778,8 @@ static int start_multi_file_filter_fn(struct subprocess_entry *subprocess)static void handle_filter_error (const struct strbuf *filter_status,struct cmd2process *entry, -const unsigned int wanted_capability) { +const unsigned int wanted_capability) +{if (!strcmp (filter_status->buf,"error" )) ;/* The filter signaled a problem with the file. */ else if (!strcmp (filter_status->buf,"abort" ) && wanted_capability) {
credential-cache--daemon.c +2 -1
@@ -91,7 +91,8 @@ static timestamp_t check_expirations(void) }static int read_request (FILE *fh,struct credential *c, -struct strbuf *action,int *timeout) { +struct strbuf *action,int *timeout) +{static struct strbuf item =STRBUF_INIT ;const char *p;
diff.c +4 -2
@@ -1637,7 +1637,8 @@ static void emit_hunk_header(struct emit_callback *ecbdata,strbuf_release (&msgbuf); } -static struct diff_tempfile *claim_diff_tempfile (void ) { +static struct diff_tempfile *claim_diff_tempfile (void ) +{int i;for (i =0 ; i <ARRAY_SIZE (diff_temp); i++)if (!diff_temp[i].name)
@@ -4819,7 +4820,8 @@ static int parse_diff_filter_opt(const char *optarg, struct diff_options *opt)return 0 ; } -static void enable_patch_output (int *fmt) { +static void enable_patch_output (int *fmt) +{ *fmt &= ~DIFF_FORMAT_NO_OUTPUT ; *fmt |=DIFF_FORMAT_PATCH ; }
git.c +2 -1
@@ -98,7 +98,8 @@ static int list_cmds(const char *spec)return 0 ; } -static void commit_pager_choice (void ) { +static void commit_pager_choice (void ) +{switch (use_pager) {case 0 :setenv ("GIT_PAGER" ,"cat" ,1 );
imap-send.c +2 -1
@@ -1471,7 +1471,8 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred) }static int curl_append_msgs_to_imap (struct imap_server_conf *server, -struct strbuf * all_msgs,int total) { +struct strbuf * all_msgs,int total) +{int ofs =0 ;int n =0 ;struct buffer msgbuf = {STRBUF_INIT ,0 };
remote-curl.c +2 -1
@@ -617,7 +617,8 @@ static int probe_rpc(struct rpc_state *rpc, struct slot_results *results)return err; } -static curl_off_t xcurl_off_t (size_t len) { +static curl_off_t xcurl_off_t (size_t len) +{uintmax_t size = len;if (size >maximum_signed_value_of_type (curl_off_t))die ("cannot handle pushes this big" );
sequencer.c +4 -2
@@ -1670,7 +1670,8 @@ static int update_squash_messages(enum todo_command command,return res; } -static void flush_rewritten_pending (void ) { +static void flush_rewritten_pending (void ) +{struct strbuf buf =STRBUF_INIT ;struct object_id newoid;FILE *out;
@@ -1695,7 +1696,8 @@ static void flush_rewritten_pending(void) { }static void record_in_rewritten (struct object_id *oid, -enum todo_command next_command) { +enum todo_command next_command) +{FILE *out =fopen_or_warn (rebase_path_rewritten_pending (),"a" );if (!out)
string-list.c +2 -1
@@ -155,7 +155,8 @@ static int item_is_not_empty(struct string_list_item *item, void *unused)return *item->string !='\0' ; } -void string_list_remove_empty_items (struct string_list *list,int free_util) { +void string_list_remove_empty_items (struct string_list *list,int free_util) +{filter_string_list (list, free_util, item_is_not_empty,NULL ); }
t/helper/test-sigchain.c +2 -1
@@ -14,7 +14,8 @@ X(two) X(three)#undef X -int cmd__sigchain (int argc,const char **argv) { +int cmd__sigchain (int argc,const char **argv) +{sigchain_push (SIGTERM , one);sigchain_push (SIGTERM , two);sigchain_push (SIGTERM , three);
transport-helper.c +2 -1
@@ -1026,7 +1026,8 @@ static int push_refs(struct transport *transport, } -static int has_attribute (const char *attrs,const char *attr) { +static int has_attribute (const char *attrs,const char *attr) +{int len;if (!attrs)return 0 ;
url.c +2 -1
@@ -104,7 +104,8 @@ void end_url_with_slash(struct strbuf *buf, const char *url)strbuf_complete (buf,'/' ); } -void str_end_url_with_slash (const char *url,char **dest) { +void str_end_url_with_slash (const char *url,char **dest) +{struct strbuf buf =STRBUF_INIT ;end_url_with_slash (&buf, url);free (*dest);
userdiff.c +2 -1
@@ -265,7 +265,8 @@ int userdiff_config(const char *k, const char *v)return 0 ; } -struct userdiff_driver *userdiff_find_by_name (const char *name) { +struct userdiff_driver *userdiff_find_by_name (const char *name) +{int len =strlen (name);return userdiff_find_by_namelen (name, len); }
Signature · 1 line
2.20.0.rc2.486.g9832c05c3d
Quoted 11 lines · Nguyễn Thái Ngọc Duy
Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>--- bisect.c | 3 ++- builtin/config.c | 3 ++- builtin/push.c | 4 +++- convert.c | 3 ++- credential-cache--daemon.c | 3 ++- diff.c | 6 ++++-- git.c | 3 ++- imap-send.c | 3 ++-
Quoted 8 lines
remote-curl.c | 3 ++- sequencer.c | 6 ++++-- string-list.c | 3 ++- t/helper/test-sigchain.c | 3 ++- transport-helper.c | 3 ++- url.c | 3 ++- userdiff.c | 3 ++- 15 files changed, 35 insertions(+), 17 deletions(-)
Can you say more about how you found these?
(Are these all of them, or did you look through some subset of files?) Or did you use a formatting tool?
Quoted 22 lines · Stefan Beller
Quoted 11 lines · Nguyễn Thái Ngọc Duy
Signed-off-by Nguyễn Thái Ngọc Duy <[email protected]>--- bisect.c | 3 ++- builtin/config.c | 3 ++- builtin/push.c | 4 +++- convert.c | 3 ++- credential-cache--daemon.c | 3 ++- diff.c | 6 ++++-- git.c | 3 ++- imap-send.c | 3 ++-Quoted 8 lines
remote-curl.c | 3 ++- sequencer.c | 6 ++++-- string-list.c | 3 ++- t/helper/test-sigchain.c | 3 ++- transport-helper.c | 3 ++- url.c | 3 ++- userdiff.c | 3 ++- 15 files changed, 35 insertions(+), 17 deletions(-)
Quoted 1 line
Can you say more about how you found these?
I was updating diff.c (65 patches coming soon!) and found one function that triggered me. "git grep '^static.*) {$'" caught most of them. A bit more regex got some more but I don't even know if I have caught them all.
Quoted 1 line
(Are these all of them, or did you look through some subset of files?)
I left compat and xdiff directories out if I remember correctly.
Quoted 1 line
Or did you use a formatting tool?
Unfortunately no. Perhaps clang-format can do it? I didn't try.
Signature · 1 line
Duy