mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-19 21:06:09 +02:00
Code

standardize brace placement in struct definitions 

In a struct definitions, unlike functions, the prevailing style is for
the opening brace to go on the same line as the struct name, like so:

 struct foo {
	int bar;
	char *baz;
 };

Indeed, grepping for 'struct [a-z_]* {$' yields about 5 times as many
matches as 'struct [a-z_]*$'.

Linus sayeth:

 Heretic people all over the world have claimed that this inconsistency
 is ...  well ...  inconsistent, but all right-thinking people know that
 (a) K&R are _right_ and (b) K&R are right.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2011-03-16 02:08:34 -05:00 committed by Junio C Hamano
parent c6c8d0b797
commit 9cba13ca5d
17 changed files with 44 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/add.c
View File

@ -21,8 +21,7 @@ static const char * const builtin_add_usage[] = {
static int patch_interactive, add_interactive, edit_interactive; static int patch_interactive, add_interactive, edit_interactive;
static int take_worktree_changes; static int take_worktree_changes;
struct update_callback_data struct update_callback_data {
{
int flags; int flags;
int add_errors; int add_errors;
}; };

3
builtin/blame.c
View File

@ -1312,8 +1312,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt)
/* /*
* Information on commits, used for output. * Information on commits, used for output.
*/ */
struct commit_info struct commit_info {
{
const char *author; const char *author;
const char *author_mail; const char *author_mail;
unsigned long author_time; unsigned long author_time;

3
builtin/grep.c
View File

@ -40,8 +40,7 @@ enum work_type {WORK_SHA1, WORK_FILE};
* threads. The producer adds struct work_items to 'todo' and the * threads. The producer adds struct work_items to 'todo' and the
* consumers pick work items from the same array. * consumers pick work items from the same array.
*/ */
struct work_item struct work_item {
{
enum work_type type; enum work_type type;
char *name; char *name;

6
builtin/index-pack.c
View File

@ -13,8 +13,7 @@
static const char index_pack_usage[] = static const char index_pack_usage[] =
"git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])"; "git index-pack [-v] [-o <index-file>] [ --keep | --keep=<msg> ] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
struct object_entry struct object_entry {
{
struct pack_idx_entry idx; struct pack_idx_entry idx;
unsigned long size; unsigned long size;
unsigned int hdr_size; unsigned int hdr_size;
@ -44,8 +43,7 @@ struct base_data {
#define FLAG_LINK (1u<<20) #define FLAG_LINK (1u<<20)
#define FLAG_CHECKED (1u<<21) #define FLAG_CHECKED (1u<<21)
struct delta_entry struct delta_entry {
{
union delta_base base; union delta_base base;
int obj_no; int obj_no;
}; };

3
commit.h
View File

@ -68,8 +68,7 @@ enum cmit_fmt {
CMIT_FMT_UNSPECIFIED CMIT_FMT_UNSPECIFIED
}; };
struct pretty_print_context struct pretty_print_context {
{
int abbrev; int abbrev;
const char *subject; const char *subject;
const char *after_subject; const char *after_subject;

3
config.c
View File

@ -20,8 +20,7 @@ static int zlib_compression_seen;
const char *config_exclusive_filename = NULL; const char *config_exclusive_filename = NULL;
struct config_item struct config_item {
{
struct config_item *next; struct config_item *next;
char *name; char *name;
char *value; char *value;

6
diff.c
View File

@ -606,16 +606,14 @@ static void diff_words_append(char *line, unsigned long len,
buffer->text.ptr[buffer->text.size] = '\0'; buffer->text.ptr[buffer->text.size] = '\0';
} }
struct diff_words_style_elem struct diff_words_style_elem {
{
const char *prefix; const char *prefix;
const char *suffix; const char *suffix;
const char *color; /* NULL; filled in by the setup code if const char *color; /* NULL; filled in by the setup code if
* color is enabled */ * color is enabled */
}; };
struct diff_words_style struct diff_words_style {
{
enum diff_words_type type; enum diff_words_type type;
struct diff_words_style_elem new, old, ctx; struct diff_words_style_elem new, old, ctx;
const char *newline; const char *newline;

42
fast-import.c
View File

@ -166,8 +166,7 @@ Format of STDIN stream:
#define DEPTH_BITS 13 #define DEPTH_BITS 13
#define MAX_DEPTH ((1<<DEPTH_BITS)-1) #define MAX_DEPTH ((1<<DEPTH_BITS)-1)
struct object_entry struct object_entry {
{
struct pack_idx_entry idx; struct pack_idx_entry idx;
struct object_entry *next; struct object_entry *next;
uint32_t type : TYPE_BITS, uint32_t type : TYPE_BITS,
@ -175,16 +174,14 @@ struct object_entry
depth : DEPTH_BITS; depth : DEPTH_BITS;
}; };
struct object_entry_pool struct object_entry_pool {
{
struct object_entry_pool *next_pool; struct object_entry_pool *next_pool;
struct object_entry *next_free; struct object_entry *next_free;
struct object_entry *end; struct object_entry *end;
struct object_entry entries[FLEX_ARRAY]; /* more */ struct object_entry entries[FLEX_ARRAY]; /* more */
}; };
struct mark_set struct mark_set {
{
union { union {
struct object_entry *marked[1024]; struct object_entry *marked[1024];
struct mark_set *sets[1024]; struct mark_set *sets[1024];
@ -192,57 +189,49 @@ struct mark_set
unsigned int shift; unsigned int shift;
}; };
struct last_object struct last_object {
{
struct strbuf data; struct strbuf data;
off_t offset; off_t offset;
unsigned int depth; unsigned int depth;
unsigned no_swap : 1; unsigned no_swap : 1;
}; };
struct mem_pool struct mem_pool {
{
struct mem_pool *next_pool; struct mem_pool *next_pool;
char *next_free; char *next_free;
char *end; char *end;
uintmax_t space[FLEX_ARRAY]; /* more */ uintmax_t space[FLEX_ARRAY]; /* more */
}; };
struct atom_str struct atom_str {
{
struct atom_str *next_atom; struct atom_str *next_atom;
unsigned short str_len; unsigned short str_len;
char str_dat[FLEX_ARRAY]; /* more */ char str_dat[FLEX_ARRAY]; /* more */
}; };
struct tree_content; struct tree_content;
struct tree_entry struct tree_entry {
{
struct tree_content *tree; struct tree_content *tree;
struct atom_str *name; struct atom_str *name;
struct tree_entry_ms struct tree_entry_ms {
{
uint16_t mode; uint16_t mode;
unsigned char sha1[20]; unsigned char sha1[20];
} versions[2]; } versions[2];
}; };
struct tree_content struct tree_content {
{
unsigned int entry_capacity; /* must match avail_tree_content */ unsigned int entry_capacity; /* must match avail_tree_content */
unsigned int entry_count; unsigned int entry_count;
unsigned int delta_depth; unsigned int delta_depth;
struct tree_entry *entries[FLEX_ARRAY]; /* more */ struct tree_entry *entries[FLEX_ARRAY]; /* more */
}; };
struct avail_tree_content struct avail_tree_content {
{
unsigned int entry_capacity; /* must match tree_content */ unsigned int entry_capacity; /* must match tree_content */
struct avail_tree_content *next_avail; struct avail_tree_content *next_avail;
}; };
struct branch struct branch {
{
struct branch *table_next_branch; struct branch *table_next_branch;
struct branch *active_next_branch; struct branch *active_next_branch;
const char *name; const char *name;
@ -254,16 +243,14 @@ struct branch
unsigned char sha1[20]; unsigned char sha1[20];
}; };
struct tag struct tag {
{
struct tag *next_tag; struct tag *next_tag;
const char *name; const char *name;
unsigned int pack_id; unsigned int pack_id;
unsigned char sha1[20]; unsigned char sha1[20];
}; };
struct hash_list struct hash_list {
{
struct hash_list *next; struct hash_list *next;
unsigned char sha1[20]; unsigned char sha1[20];
}; };
@ -274,8 +261,7 @@ typedef enum {
WHENSPEC_NOW WHENSPEC_NOW
} whenspec_type; } whenspec_type;
struct recent_command struct recent_command {
{
struct recent_command *prev; struct recent_command *prev;
struct recent_command *next; struct recent_command *next;
char *buf; char *buf;

3
fetch-pack.h
View File

@ -1,8 +1,7 @@
#ifndef FETCH_PACK_H #ifndef FETCH_PACK_H
#define FETCH_PACK_H #define FETCH_PACK_H
struct fetch_pack_args struct fetch_pack_args {
{
const char *uploadpack; const char *uploadpack;
int unpacklimit; int unpacklimit;
int depth; int depth;

3
generate-cmdlist.sh
View File

@ -1,8 +1,7 @@
#!/bin/sh #!/bin/sh
echo "/* Automatically generated by $0 */ echo "/* Automatically generated by $0 */
struct cmdname_help struct cmdname_help {
{
char name[16]; char name[16];
char help[80]; char help[80];
}; };

15
http-push.c
View File

@ -82,8 +82,7 @@ static int helper_status;
static struct object_list *objects; static struct object_list *objects;
struct repo struct repo {
{
char *url; char *url;
char *path; char *path;
int path_len; int path_len;
@ -108,8 +107,7 @@ enum transfer_state {
COMPLETE COMPLETE
}; };
struct transfer_request struct transfer_request {
{
struct object *obj; struct object *obj;
char *url; char *url;
char *dest; char *dest;
@ -127,8 +125,7 @@ struct transfer_request
static struct transfer_request *request_queue_head; static struct transfer_request *request_queue_head;
struct xml_ctx struct xml_ctx {
{
char *name; char *name;
int len; int len;
char *cdata; char *cdata;
@ -136,8 +133,7 @@ struct xml_ctx
void *userData; void *userData;
}; };
struct remote_lock struct remote_lock {
{
char *url; char *url;
char *owner; char *owner;
char *token; char *token;
@ -156,8 +152,7 @@ struct remote_lock
/* Flags that remote_ls passes to callback functions */ /* Flags that remote_ls passes to callback functions */
#define IS_DIR (1u << 0) #define IS_DIR (1u << 0)
struct remote_ls_ctx struct remote_ls_ctx {
{
char *path; char *path;
void (*userFunc)(struct remote_ls_ctx *ls); void (*userFunc)(struct remote_ls_ctx *ls);
void *userData; void *userData;

6
http-walker.c
View File

@ -3,8 +3,7 @@
#include "walker.h" #include "walker.h"
#include "http.h" #include "http.h"
struct alt_base struct alt_base {
{
char *base; char *base;
int got_indices; int got_indices;
struct packed_git *packs; struct packed_git *packs;
@ -18,8 +17,7 @@ enum object_request_state {
COMPLETE COMPLETE
}; };
struct object_request struct object_request {
{
struct walker *walker; struct walker *walker;
unsigned char sha1[20]; unsigned char sha1[20];
struct alt_base *repo; struct alt_base *repo;

15
http.h
View File

@ -42,14 +42,12 @@
#define NO_CURL_IOCTL #define NO_CURL_IOCTL
#endif #endif
struct slot_results struct slot_results {
{
CURLcode curl_result; CURLcode curl_result;
long http_code; long http_code;
}; };
struct active_request_slot struct active_request_slot {
{
CURL *curl; CURL *curl;
FILE *local; FILE *local;
int in_use; int in_use;
@ -62,8 +60,7 @@ struct active_request_slot
struct active_request_slot *next; struct active_request_slot *next;
}; };
struct buffer struct buffer {
{
struct strbuf buf; struct strbuf buf;
size_t posn; size_t posn;
}; };
@ -149,8 +146,7 @@ extern int http_fetch_ref(const char *base, struct ref *ref);
extern int http_get_info_packs(const char *base_url, extern int http_get_info_packs(const char *base_url,
struct packed_git **packs_head); struct packed_git **packs_head);
struct http_pack_request struct http_pack_request {
{
char *url; char *url;
struct packed_git *target; struct packed_git *target;
struct packed_git **lst; struct packed_git **lst;
@ -166,8 +162,7 @@ extern int finish_http_pack_request(struct http_pack_request *preq);
extern void release_http_pack_request(struct http_pack_request *preq); extern void release_http_pack_request(struct http_pack_request *preq);
/* Helpers for fetching object */ /* Helpers for fetching object */
struct http_object_request struct http_object_request {
{
char *url; char *url;
char tmpfile[PATH_MAX]; char tmpfile[PATH_MAX];
int localfile; int localfile;

12
merge-recursive.c
View File

@ -83,10 +83,8 @@ struct rename_df_conflict_info {
* Since we want to write the index eventually, we cannot reuse the index * Since we want to write the index eventually, we cannot reuse the index
* for these (temporary) data. * for these (temporary) data.
*/ */
struct stage_data struct stage_data {
{ struct {
struct
{
unsigned mode; unsigned mode;
unsigned char sha[20]; unsigned char sha[20];
} stages[4]; } stages[4];
@ -403,8 +401,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
} }
} }
struct rename struct rename {
{
struct diff_filepair *pair; struct diff_filepair *pair;
struct stage_data *src_entry; struct stage_data *src_entry;
struct stage_data *dst_entry; struct stage_data *dst_entry;
@ -717,8 +714,7 @@ static void update_file(struct merge_options *o,
/* Low level file merging, update and removal */ /* Low level file merging, update and removal */
struct merge_file_info struct merge_file_info {
{
unsigned char sha[20]; unsigned char sha[20];
unsigned mode; unsigned mode;
unsigned clean:1, unsigned clean:1,

3
pack-check.c
View File

@ -2,8 +2,7 @@
#include "pack.h" #include "pack.h"
#include "pack-revindex.h" #include "pack-revindex.h"
struct idx_entry struct idx_entry {
{
off_t offset; off_t offset;
const unsigned char *sha1; const unsigned char *sha1;
unsigned int nr; unsigned int nr;

3
string-list.h
View File

@ -5,8 +5,7 @@ struct string_list_item {
char *string; char *string;
void *util; void *util;
}; };
struct string_list struct string_list {
{
struct string_list_item *items; struct string_list_item *items;
unsigned int nr, alloc; unsigned int nr, alloc;
unsigned int strdup_strings:1; unsigned int strdup_strings:1;

3
transport-helper.c
View File

@ -12,8 +12,7 @@
static int debug; static int debug;
struct helper_data struct helper_data {
{
const char *name; const char *name;
struct child_process *helper; struct child_process *helper;
FILE *out; FILE *out;