Skip to content

Commit f2b6aa9

Browse files
committed
Merge branch 'nd/indentation-fix'
Code cleanup. * nd/indentation-fix: Indent code with TABs
2 parents 9a01f16 + ec36c42 commit f2b6aa9

File tree

13 files changed

+77
-77
lines changed

13 files changed

+77
-77
lines changed

archive-tar.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static int stream_blocked(const struct object_id *oid)
142142
* string and appends it to a struct strbuf.
143143
*/
144144
static void strbuf_append_ext_header(struct strbuf *sb, const char *keyword,
145-
const char *value, unsigned int valuelen)
145+
const char *value, unsigned int valuelen)
146146
{
147147
int len, tmp;
148148

archive.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ void init_archivers(void)
3636
}
3737

3838
static void format_subst(const struct commit *commit,
39-
const char *src, size_t len,
40-
struct strbuf *buf)
39+
const char *src, size_t len,
40+
struct strbuf *buf)
4141
{
4242
char *to_free = NULL;
4343
struct strbuf fmt = STRBUF_INIT;

builtin/add.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ static void refresh(int verbose, const struct pathspec *pathspec)
176176
die(_("pathspec '%s' did not match any files"),
177177
pathspec->items[i].match);
178178
}
179-
free(seen);
179+
free(seen);
180180
}
181181

182182
int run_add_interactive(const char *revision, const char *patch_mode,

builtin/gc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ static void add_repack_all_option(struct string_list *keep_pack)
317317

318318
static void add_repack_incremental_option(void)
319319
{
320-
argv_array_push(&repack, "--no-write-bitmap-index");
320+
argv_array_push(&repack, "--no-write-bitmap-index");
321321
}
322322

323323
static int need_to_gc(void)

cache-tree.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ int cache_tree_update(struct index_state *istate, int flags)
448448
}
449449

450450
static void write_one(struct strbuf *buffer, struct cache_tree *it,
451-
const char *path, int pathlen)
451+
const char *path, int pathlen)
452452
{
453453
int i;
454454

convert.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ static int filter_buffer_or_fd(int in, int out, void *data)
705705
}
706706

707707
static int apply_single_file_filter(const char *path, const char *src, size_t len, int fd,
708-
struct strbuf *dst, const char *cmd)
708+
struct strbuf *dst, const char *cmd)
709709
{
710710
/*
711711
* Create a pipeline to have the command filter the buffer's
@@ -1091,7 +1091,7 @@ static int count_ident(const char *cp, unsigned long size)
10911091
}
10921092

10931093
static int ident_to_git(const char *path, const char *src, size_t len,
1094-
struct strbuf *buf, int ident)
1094+
struct strbuf *buf, int ident)
10951095
{
10961096
char *dst, *dollar;
10971097

@@ -1135,7 +1135,7 @@ static int ident_to_git(const char *path, const char *src, size_t len,
11351135
}
11361136

11371137
static int ident_to_worktree(const char *path, const char *src, size_t len,
1138-
struct strbuf *buf, int ident)
1138+
struct strbuf *buf, int ident)
11391139
{
11401140
struct object_id oid;
11411141
char *to_free = NULL, *dollar, *spc;

git-compat-util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@ extern const char *githstrerror(int herror);
722722
#ifdef NO_MEMMEM
723723
#define memmem gitmemmem
724724
void *gitmemmem(const void *haystack, size_t haystacklen,
725-
const void *needle, size_t needlelen);
725+
const void *needle, size_t needlelen);
726726
#endif
727727

728728
#ifdef OVERRIDE_STRDUP

parse-options.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ static int parse_short_opt(struct parse_opt_ctx_t *p, const struct option *optio
236236
}
237237

238238
static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg,
239-
const struct option *options)
239+
const struct option *options)
240240
{
241241
const struct option *all_opts = options;
242242
const char *arg_end = strchrnul(arg, '=');

parse-options.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ struct option {
175175
* Returns the number of arguments left in argv[].
176176
*/
177177
extern int parse_options(int argc, const char **argv, const char *prefix,
178-
const struct option *options,
179-
const char * const usagestr[], int flags);
178+
const struct option *options,
179+
const char * const usagestr[], int flags);
180180

181181
extern NORETURN void usage_with_options(const char * const *usagestr,
182-
const struct option *options);
182+
const struct option *options);
183183

184184
extern NORETURN void usage_msg_opt(const char *msg,
185185
const char * const *usagestr,

quote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen)
234234
* Return value is the same as in (1).
235235
*/
236236
static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
237-
struct strbuf *sb, FILE *fp, int no_dq)
237+
struct strbuf *sb, FILE *fp, int no_dq)
238238
{
239239
#undef EMIT
240240
#define EMIT(c) \

0 commit comments

Comments
 (0)