kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ah/cleanups' 

Miscellaneous code clean-ups.

* ah/cleanups:
  git_mkstemps_mode(): replace magic numbers with computed value
  wrapper: use a loop instead of repetitive statements
  diffcore-break: use a goto instead of a redundant if statement
  commit-graph: remove a duplicate assignment
maint
Junio C Hamano 2019-10-09 14:01:00 +09:00
parent 772cad0afb 53d687bf5f
commit 6e12570822
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commit-graph.c
View File

@ -1533,8 +1533,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)


static void split_graph_merge_strategy(struct write_commit_graph_context *ctx) static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
{ {
struct commit_graph *g = ctx->r->objects->commit_graph; struct commit_graph *g;
uint32_t num_commits = ctx->commits.nr; uint32_t num_commits;
uint32_t i; uint32_t i;


int max_commits = 0; int max_commits = 0;
@ -1546,6 +1546,7 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
} }


g = ctx->r->objects->commit_graph; g = ctx->r->objects->commit_graph;
num_commits = ctx->commits.nr;
ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1; ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;


while (g && (g->num_commits <= size_mult * num_commits || while (g && (g->num_commits <= size_mult * num_commits ||

4
diffcore-break.c
View File

@ -286,10 +286,9 @@ void diffcore_merge_broken(void)
/* Peer survived. Merge them */ /* Peer survived. Merge them */
merge_broken(p, pp, &outq); merge_broken(p, pp, &outq);
q->queue[j] = NULL; q->queue[j] = NULL;
break; goto next;
} }
} }
if (q->nr <= j)
/* The peer did not survive, so we keep /* The peer did not survive, so we keep
* it in the output. * it in the output.
*/ */
@ -297,6 +296,7 @@ void diffcore_merge_broken(void)
} }
else else
diff_q(&outq, p); diff_q(&outq, p);
next:;
} }
free(q->queue); free(q->queue);
*q = outq; *q = outq;

21
wrapper.c
View File

@ -441,7 +441,9 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
"abcdefghijklmnopqrstuvwxyz" "abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ" "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"0123456789"; "0123456789";
static const int num_letters = 62; static const int num_letters = ARRAY_SIZE(letters) - 1;
static const char x_pattern[] = "XXXXXX";
static const int num_x = ARRAY_SIZE(x_pattern) - 1;
uint64_t value; uint64_t value;
struct timeval tv; struct timeval tv;
char *filename_template; char *filename_template;
@ -450,12 +452,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)


len = strlen(pattern); len = strlen(pattern);


if (len < 6 + suffix_len) { if (len < num_x + suffix_len) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }


if (strncmp(&pattern[len - 6 - suffix_len], "XXXXXX", 6)) { if (strncmp(&pattern[len - num_x - suffix_len], x_pattern, num_x)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
@ -466,16 +468,15 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode)
*/ */
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid(); value = ((uint64_t)tv.tv_usec << 16) ^ tv.tv_sec ^ getpid();
filename_template = &pattern[len - 6 - suffix_len]; filename_template = &pattern[len - num_x - suffix_len];
for (count = 0; count < TMP_MAX; ++count) { for (count = 0; count < TMP_MAX; ++count) {
uint64_t v = value; uint64_t v = value;
int i;
/* Fill in the random bits. */ /* Fill in the random bits. */
filename_template[0] = letters[v % num_letters]; v /= num_letters; for (i = 0; i < num_x; i++) {
filename_template[1] = letters[v % num_letters]; v /= num_letters; filename_template[i] = letters[v % num_letters];
filename_template[2] = letters[v % num_letters]; v /= num_letters; v /= num_letters;
filename_template[3] = letters[v % num_letters]; v /= num_letters; }
filename_template[4] = letters[v % num_letters]; v /= num_letters;
filename_template[5] = letters[v % num_letters]; v /= num_letters;


fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode); fd = open(pattern, O_CREAT | O_EXCL | O_RDWR, mode);
if (fd >= 0) if (fd >= 0)