coccinelle: convert hashcpy() with null_sha1 to hashclr()
hashcpy with null_sha1 as the source is equivalent to hashclr. In addition to being simpler, using hashclr may give the compiler a chance to optimize better. Convert instances of hashcpy with the source argument of null_sha1 to hashclr. This transformation was implemented using the following semantic patch: @@ expression E1; @@ -hashcpy(E1, null_sha1); +hashclr(E1); Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jun 24, 2016 at 23:09 UTC
f449198e58630b8b57c94e3eeab4927afd7ee03a
5 files changed
+6
-6
builtin/merge.c
+1
-1
@@ -1530,7 +1530,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1530
* Stash away the local changes so that we can try more than one.
1531
*/
1532
save_state(stash))
1533
- hashcpy(stash, null_sha1);
1533
+ hashclr(stash);
1534
1535
for (i = 0; i < use_strategies_nr; i++) {
1536
int ret;
builtin/unpack-objects.c
+2
-2
@@ -355,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
355
return; /* we are done */
356
else {
357
/* cannot resolve yet --- queue it */
358
- hashcpy(obj_list[nr].sha1, null_sha1);
358
+ hashclr(obj_list[nr].sha1);
359
add_delta_to_list(nr, base_sha1, 0, delta_data, delta_size);
360
return;
361
}
@@ -406,7 +406,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
406
* The delta base object is itself a delta that
407
* has not been resolved yet.
408
*/
409
- hashcpy(obj_list[nr].sha1, null_sha1);
409
+ hashclr(obj_list[nr].sha1);
410
add_delta_to_list(nr, null_sha1, base_offset, delta_data, delta_size);
411
return;
412
}
diff.c
+1
-1
@@ -3134,7 +3134,7 @@ static void diff_fill_sha1_info(struct diff_filespec *one)
3134
if (!one->sha1_valid) {
3135
struct stat st;
3136
if (one->is_stdin) {
3137
- hashcpy(one->sha1, null_sha1);
3137
+ hashclr(one->sha1);
3138
return;
3139
}
3140
if (lstat(one->path, &st) < 0)
submodule-config.c
+1
-1
@@ -368,7 +368,7 @@ static int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
368
int ret = 0;
369
370
if (is_null_sha1(commit_sha1)) {
371
- hashcpy(gitmodules_sha1, null_sha1);
371
+ hashclr(gitmodules_sha1);
372
return 1;
373
}
374
t/helper/test-submodule-config.c
+1
-1
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
49
path_or_name = arg[1];
50
51
if (commit[0] == '\0')
52
- hashcpy(commit_sha1, null_sha1);
52
+ hashclr(commit_sha1);
53
else if (get_sha1(commit, commit_sha1) < 0)
54
die_usage(argc, argv, "Commit not found.");
55