diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:14:38 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:14:38 +0900 |
| commit | 5ff6a8462f7461075fb39cd0d6d76e6c51ffbc9f (patch) | |
| tree | ae4581c010d54ff4c58c050bb38a34ed80b42eb1 /match-trees.c | |
| parent | 19729fb7029c2bb287c72c7dcc5e5a293a069d09 (diff) | |
| download | git-5ff6a8462f7461075fb39cd0d6d76e6c51ffbc9f.tar.gz git-5ff6a8462f7461075fb39cd0d6d76e6c51ffbc9f.tar.bz2 git-5ff6a8462f7461075fb39cd0d6d76e6c51ffbc9f.zip | |
Imported Upstream version 2.1.0upstream/2.1.0
Diffstat (limited to 'match-trees.c')
| -rw-r--r-- | match-trees.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/match-trees.c b/match-trees.c index e80b4af3..1ce0954a 100644 --- a/match-trees.c +++ b/match-trees.c @@ -140,17 +140,12 @@ static void match_trees(const unsigned char *hash1, goto next; score = score_trees(elem, hash2); if (*best_score < score) { - char *newpath; - newpath = xmalloc(strlen(base) + strlen(path) + 1); - sprintf(newpath, "%s%s", base, path); free(*best_match); - *best_match = newpath; + *best_match = xstrfmt("%s%s", base, path); *best_score = score; } if (recurse_limit) { - char *newbase; - newbase = xmalloc(strlen(base) + strlen(path) + 2); - sprintf(newbase, "%s%s/", base, path); + char *newbase = xstrfmt("%s%s/", base, path); match_trees(elem, hash2, best_score, best_match, newbase, recurse_limit - 1); free(newbase); |