commit 280f921b7f983840bfb1f82e25c054ce55034924 from: Stefan Sperling date: Sun May 12 19:30:43 2019 UTC heed API namespace: got_dir_is_empty -> got_path_dir_is_empty commit - 3c45a30aebce27db2fb0f5b453695260456bacc9 commit + 280f921b7f983840bfb1f82e25c054ce55034924 blob - 3d3ea43dcf4295a664e1352ecbafb88f28096f6a blob + 8e3450b0e37d17bafe65d4606f940508826bf59e --- got/got.c +++ got/got.c @@ -205,7 +205,7 @@ apply_unveil(const char *repo_path, int repo_read_only error = got_path_mkdir(worktree_path); if (errno == EEXIST) { - if (got_dir_is_empty(worktree_path)) { + if (got_path_dir_is_empty(worktree_path)) { errno = 0; error = NULL; } else { blob - b80b464ead9ddd50e8e97e06b4d5fc92a1268f4a blob + c7b7e0f690e91e88eb1117ea6f211e847a6d17c9 --- include/got_path.h +++ include/got_path.h @@ -91,7 +91,7 @@ void got_pathlist_free(struct got_pathlist_head *); const struct got_error *got_path_mkdir(const char *); /* Determine whether a directory has no files or directories in it. */ -int got_dir_is_empty(const char *); +int got_path_dir_is_empty(const char *); /* dirname(3) with error handling and dynamically allocated result. */ const struct got_error *got_path_dirname(char **, const char *); blob - abd5d7f4e126836f6242180512c1307ef26963cd blob + 9a681d1a3b3fe43270ba1cd36ff0c1aa16ceda6e --- lib/path.c +++ lib/path.c @@ -327,7 +327,7 @@ done: } int -got_dir_is_empty(const char *dir) +got_path_dir_is_empty(const char *dir) { DIR *d; struct dirent *dent;