commit - 55566b341d4e756abe6b0096c4a0b0548aae94b0
commit + 2969636801a678472e0c37a7d99b526651961210
blob - c58c241572783b631a3bb336ed0daab98750a241
blob + 6c29e98e5a2c06798017cda85f03e0a402aa92d6
--- lib/object.c
+++ lib/object.c
struct got_tree_object *tree1 = NULL, *tree2 = NULL;
struct got_tree_entry *te1 = NULL, *te2 = NULL;
const char *seg, *s;
- size_t seglen, len = strlen(path);
+ size_t seglen, remain = strlen(path);
*changed = 0;
tree2 = tree02;
s = path;
s++; /* skip leading '/' */
- len--;
+ remain--;
seg = s;
seglen = 0;
- while (len > 0) {
+ while (remain > 0) {
struct got_tree_object *next_tree1, *next_tree2;
if (*s != '/') {
s++;
- len--;
+ remain--;
seglen++;
if (*s)
continue;
goto done;
}
- if (len == 0) { /* final path element */
+ if (remain == 0) { /* final path element */
*changed = 1;
goto done;
}
seg = s + 1;
s++;
- len--;
+ remain--;
seglen = 0;
if (*s) {
err = got_object_open_as_tree(&next_tree1, repo,