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

Merge branch 'jk/unused-parameter-cleanup' 

Code cleanup.

* jk/unused-parameter-cleanup:
  convert: drop path parameter from actual conversion functions
  convert: drop len parameter from conversion checks
  config: drop unused parameter from maybe_remove_section()
  show_date_relative(): drop unused "tz" parameter
  column: drop unused "opts" parameter in item_length()
  create_bundle(): drop unused "header" parameter
  apply: drop unused "def" parameter from find_name_gnu()
  match-trees: drop unused path parameter from score functions
This commit is contained in:
Junio C Hamano 2019-02-06 22:05:23 -08:00
parent 7589e63648 55ad152cfb
commit b2fc9d2fb0
11 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apply.c
View File

@ -467,7 +467,6 @@ static char *squash_slash(char *name)
static char *find_name_gnu(struct apply_state *state,
const char *line,
const char *def,
int p_value)
{
struct strbuf name = STRBUF_INIT;
@ -714,7 +713,7 @@ static char *find_name(struct apply_state *state,
int terminate)
{
if (*line == '"') {
char *name = find_name_gnu(state, line, def, p_value);
char *name = find_name_gnu(state, line, p_value);
if (name)
return name;
}
@ -731,7 +730,7 @@ static char *find_name_traditional(struct apply_state *state,
size_t date_len;
if (*line == '"') {
char *name = find_name_gnu(state, line, def, p_value);
char *name = find_name_gnu(state, line, p_value);
if (name)
return name;
}

3
builtin/bundle.c
View File

@ -56,8 +56,7 @@ int cmd_bundle(int argc, const char **argv, const char *prefix)
}
if (!startup_info->have_repository)
die(_("Need a repository to create a bundle."));
return !!create_bundle(the_repository, &header,
bundle_file, argc, argv);
return !!create_bundle(the_repository, bundle_file, argc, argv);
} else if (!strcmp(cmd, "unbundle")) {
if (!startup_info->have_repository)
die(_("Need a repository to unbundle."));

4
bundle.c
View File

@ -424,8 +424,8 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
return ref_count;
}
int create_bundle(struct repository *r, struct bundle_header *header,
const char *path, int argc, const char **argv)
int create_bundle(struct repository *r, const char *path,
int argc, const char **argv)
{
struct lock_file lock = LOCK_INIT;
int bundle_fd = -1;

4
bundle.h
View File

@ -18,8 +18,8 @@ struct bundle_header {
int is_bundle(const char *path, int quiet);
int read_bundle_header(const char *path, struct bundle_header *header);
int create_bundle(struct repository *r, struct bundle_header *header,
const char *path, int argc, const char **argv);
int create_bundle(struct repository *r, const char *path,
int argc, const char **argv);
int verify_bundle(struct repository *r, struct bundle_header *header, int verbose);
#define BUNDLE_VERBOSE 1
int unbundle(struct repository *r, struct bundle_header *header,

2
cache.h
View File

@ -1488,7 +1488,7 @@ struct date_mode {
struct date_mode *date_mode_from_type(enum date_mode_type type);
const char *show_date(timestamp_t time, int timezone, const struct date_mode *mode);
void show_date_relative(timestamp_t time, int tz, const struct timeval *now,
void show_date_relative(timestamp_t time, const struct timeval *now,
struct strbuf *timebuf);
int parse_date(const char *date, struct strbuf *out);
int parse_date_basic(const char *date, timestamp_t *timestamp, int *offset);

4
column.c
View File

@ -21,7 +21,7 @@ struct column_data {
};
/* return length of 's' in letters, ANSI escapes stripped */
static int item_length(unsigned int colopts, const char *s)
static int item_length(const char *s)
{
int len, i = 0;
struct strbuf str = STRBUF_INIT;
@ -167,7 +167,7 @@ static void display_table(const struct string_list *list,
ALLOC_ARRAY(data.len, list->nr);
for (i = 0; i < list->nr; i++)
data.len[i] = item_length(colopts, list->items[i].string);
data.len[i] = item_length(list->items[i].string);
layout(&data, &initial_width);

3
config.c
View File

@ -2565,7 +2565,6 @@ static ssize_t write_pair(int fd, const char *key, const char *value,
* entry (which all are to be removed).
*/
static void maybe_remove_section(struct config_store_data *store,
const char *contents,
size_t *begin_offset, size_t *end_offset,
int *seen_ptr)
{
@ -2850,7 +2849,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
replace_end = store.parsed[j].end;
copy_end = store.parsed[j].begin;
if (!value)
maybe_remove_section(&store, contents,
maybe_remove_section(&store,
&copy_end,
&replace_end, &i);
/*

28
convert.c
View File

@ -91,7 +91,7 @@ static void gather_stats(const char *buf, unsigned long size, struct text_stat *
* The same heuristics as diff.c::mmfile_is_binary()
* We treat files with bare CR as binary
*/
static int convert_is_binary(unsigned long size, const struct text_stat *stats)
static int convert_is_binary(const struct text_stat *stats)
{
if (stats->lonecr)
return 1;
@ -109,7 +109,7 @@ static unsigned int gather_convert_stats(const char *data, unsigned long size)
if (!data || !size)
return 0;
gather_stats(data, size, &stats);
if (convert_is_binary(size, &stats))
if (convert_is_binary(&stats))
ret |= CONVERT_STAT_BITS_BIN;
if (stats.crlf)
ret |= CONVERT_STAT_BITS_TXT_CRLF;
@ -244,7 +244,7 @@ static int has_crlf_in_index(const struct index_state *istate, const char *path)
return has_crlf;
}
static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
static int will_convert_lf_to_crlf(struct text_stat *stats,
enum crlf_action crlf_action)
{
if (output_eol(crlf_action) != EOL_CRLF)
@ -259,7 +259,7 @@ static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
if (stats->lonecr || stats->crlf)
return 0;
if (convert_is_binary(len, stats))
if (convert_is_binary(stats))
return 0;
}
return 1;
@ -526,7 +526,7 @@ static int crlf_to_git(const struct index_state *istate,
convert_crlf_into_lf = !!stats.crlf;
if (crlf_action == CRLF_AUTO || crlf_action == CRLF_AUTO_INPUT || crlf_action == CRLF_AUTO_CRLF) {
if (convert_is_binary(len, &stats))
if (convert_is_binary(&stats))
return 0;
/*
* If the file in the index has any CR in it, do not
@ -548,7 +548,7 @@ static int crlf_to_git(const struct index_state *istate,
new_stats.crlf = 0;
}
/* simulate "git checkout" */
if (will_convert_lf_to_crlf(len, &new_stats, crlf_action)) {
if (will_convert_lf_to_crlf(&new_stats, crlf_action)) {
new_stats.crlf += new_stats.lonelf;
new_stats.lonelf = 0;
}
@ -590,7 +590,7 @@ static int crlf_to_git(const struct index_state *istate,
return 1;
}
static int crlf_to_worktree(const char *path, const char *src, size_t len,
static int crlf_to_worktree(const char *src, size_t len,
struct strbuf *buf, enum crlf_action crlf_action)
{
char *to_free = NULL;
@ -600,7 +600,7 @@ static int crlf_to_worktree(const char *path, const char *src, size_t len,
return 0;
gather_stats(src, len, &stats);
if (!will_convert_lf_to_crlf(len, &stats, crlf_action))
if (!will_convert_lf_to_crlf(&stats, crlf_action))
return 0;
/* are we "faking" in place editing ? */
@ -1090,7 +1090,7 @@ static int count_ident(const char *cp, unsigned long size)
return cnt;
}
static int ident_to_git(const char *path, const char *src, size_t len,
static int ident_to_git(const char *src, size_t len,
struct strbuf *buf, int ident)
{
char *dst, *dollar;
@ -1134,7 +1134,7 @@ static int ident_to_git(const char *path, const char *src, size_t len,
return 1;
}
static int ident_to_worktree(const char *path, const char *src, size_t len,
static int ident_to_worktree(const char *src, size_t len,
struct strbuf *buf, int ident)
{
struct object_id oid;
@ -1415,7 +1415,7 @@ int convert_to_git(const struct index_state *istate,
len = dst->len;
}
}
return ret | ident_to_git(path, src, len, dst, ca.ident);
return ret | ident_to_git(src, len, dst, ca.ident);
}
void convert_to_git_filter_fd(const struct index_state *istate,
@ -1433,7 +1433,7 @@ void convert_to_git_filter_fd(const struct index_state *istate,
encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, conv_flags);
crlf_to_git(istate, path, dst->buf, dst->len, dst, ca.crlf_action, conv_flags);
ident_to_git(path, dst->buf, dst->len, dst, ca.ident);
ident_to_git(dst->buf, dst->len, dst, ca.ident);
}
static int convert_to_working_tree_internal(const struct index_state *istate,
@ -1446,7 +1446,7 @@ static int convert_to_working_tree_internal(const struct index_state *istate,
convert_attrs(istate, &ca, path);
ret |= ident_to_worktree(path, src, len, dst, ca.ident);
ret |= ident_to_worktree(src, len, dst, ca.ident);
if (ret) {
src = dst->buf;
len = dst->len;
@ -1457,7 +1457,7 @@ static int convert_to_working_tree_internal(const struct index_state *istate,
* support smudge). The filters might expect CRLFs.
*/
if ((ca.drv && (ca.drv->smudge || ca.drv->process)) || !normalizing) {
ret |= crlf_to_worktree(path, src, len, dst, ca.crlf_action);
ret |= crlf_to_worktree(src, len, dst, ca.crlf_action);
if (ret) {
src = dst->buf;
len = dst->len;

8
date.c
View File

@ -107,9 +107,9 @@ static int local_tzoffset(timestamp_t time)
return offset * eastwest;
}
void show_date_relative(timestamp_t time, int tz,
const struct timeval *now,
struct strbuf *timebuf)
void show_date_relative(timestamp_t time,
const struct timeval *now,
struct strbuf *timebuf)
{
timestamp_t diff;
if (now->tv_sec < time) {
@ -216,7 +216,7 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
strbuf_reset(&timebuf);
gettimeofday(&now, NULL);
show_date_relative(time, tz, &now, &timebuf);
show_date_relative(time, &now, &timebuf);
return timebuf.buf;
}

16
match-trees.c
View File

@ -3,7 +3,7 @@
#include "tree-walk.h"
#include "object-store.h"
static int score_missing(unsigned mode, const char *path)
static int score_missing(unsigned mode)
{
int score;
@ -16,7 +16,7 @@ static int score_missing(unsigned mode, const char *path)
return score;
}
static int score_differs(unsigned mode1, unsigned mode2, const char *path)
static int score_differs(unsigned mode1, unsigned mode2)
{
int score;
@ -29,7 +29,7 @@ static int score_differs(unsigned mode1, unsigned mode2, const char *path)
return score;
}
static int score_matches(unsigned mode1, unsigned mode2, const char *path)
static int score_matches(unsigned mode1, unsigned mode2)
{
int score;
@ -98,24 +98,22 @@ static int score_trees(const struct object_id *hash1, const struct object_id *ha
if (cmp < 0) {
/* path1 does not appear in two */
score += score_missing(one.entry.mode, one.entry.path);
score += score_missing(one.entry.mode);
update_tree_entry(&one);
} else if (cmp > 0) {
/* path2 does not appear in one */
score += score_missing(two.entry.mode, two.entry.path);
score += score_missing(two.entry.mode);
update_tree_entry(&two);
} else {
/* path appears in both */
if (!oideq(&one.entry.oid, &two.entry.oid)) {
/* they are different */
score += score_differs(one.entry.mode,
two.entry.mode,
one.entry.path);
two.entry.mode);
} else {
/* same subtree or blob */
score += score_matches(one.entry.mode,
two.entry.mode,
one.entry.path);
two.entry.mode);
}
update_tree_entry(&one);
update_tree_entry(&two);

2
t/helper/test-date.c
View File

@ -16,7 +16,7 @@ static void show_relative_dates(const char **argv, struct timeval *now)
for (; *argv; argv++) {
time_t t = atoi(*argv);
show_date_relative(t, 0, now, &buf);
show_date_relative(t, now, &buf);
printf("%s -> %s\n", *argv, buf.buf);
}
strbuf_release(&buf);