commit 1f46d0af752f3e60c6ed712b8120328af9d4cd9a
from: Stefan Sperling <stsp@stsp.name>
date: Sun Jan 06 12:06:21 2019 UTC

rename misleadinly named field in struct collect_missing_entry_args

commit - 82d71325af9661465ecf314c98d8eecc487befc4
commit + 1f46d0af752f3e60c6ed712b8120328af9d4cd9a
blob - a4c0065c84ec06865acc4d598571f1c2b23c90c2
blob + b9ce3065d3643e84bd1463d6f6a538314843ce51
--- lib/worktree.c
+++ lib/worktree.c
@@ -741,7 +741,7 @@ struct collect_missing_entry_args {
 	struct got_fileindex *fileindex;
 	const struct got_tree_entries *entries;
 	struct got_fileindex missing_entries;
-	const char *path_prefix;
+	const char *current_subdir;
 };
 
 static const struct got_error *
@@ -753,11 +753,12 @@ collect_missing_file(void *args, struct got_fileindex_
 	struct got_tree_entry *te;
 	int found = 0;
 
-	if (a->path_prefix[0] != '\0' &&
-	    strncmp(a->path_prefix, entry->path, strlen(a->path_prefix)) != 0)
+	if (a->current_subdir[0] != '\0' &&
+	    strncmp(a->current_subdir, entry->path,
+	    strlen(a->current_subdir)) != 0)
 		return NULL;
 
-	start = entry->path + strlen(a->path_prefix);
+	start = entry->path + strlen(a->current_subdir);
 	while (start[0] == '/')
 		start++;
 	end = strchr(start, '/');
@@ -797,9 +798,9 @@ remove_missing_files(struct got_worktree *worktree, co
 	a.fileindex = fileindex;
 	a.entries = entries;
 	a.missing_entries.nentries = 0;
-	a.path_prefix = path;
-	while (a.path_prefix[0] == '/')
-		a.path_prefix++;
+	a.current_subdir = path;
+	while (a.current_subdir[0] == '/')
+		a.current_subdir++;
 	TAILQ_INIT(&a.missing_entries.entries);
 	err = got_fileindex_for_each_entry(fileindex, collect_missing_file, &a);
 	if (err)