Commit 25bd0aaf20463fd9d00d882d39cb1cfec4aa6917
2015-06-15T13:28:08
path: remove unnecessary readdir_r usage Arguably all uses of readdir_r are unnecessary, but in this case especially so, as the directory handle only exists within this function, so we don't race with anybody.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/src/path.c b/src/path.c
index 0ee3efa..aca85f9 100644
--- a/src/path.c
+++ b/src/path.c
@@ -889,7 +889,7 @@ void git_path_iconv_clear(git_path_iconv_t *ic)
}
}
-int git_path_iconv(git_path_iconv_t *ic, char **in, size_t *inlen)
+int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen)
{
char *nfd = *in, *nfc;
size_t nfdlen = *inlen, nfclen, wantlen = nfdlen, alloclen, rv;
@@ -1018,8 +1018,7 @@ int git_path_direach(
int error = 0;
ssize_t wd_len;
DIR *dir;
- path_dirent_data de_data;
- struct dirent *de, *de_buf = (struct dirent *)&de_data;
+ struct dirent *de;
#ifdef GIT_USE_ICONV
git_path_iconv_t ic = GIT_PATH_ICONV_INIT;
@@ -1045,7 +1044,7 @@ int git_path_direach(
(void)git_path_iconv_init_precompose(&ic);
#endif
- while (p_readdir_r(dir, de_buf, &de) == 0 && de != NULL) {
+ while ((de = readdir(dir)) != NULL) {
char *de_path = de->d_name;
size_t de_len = strlen(de_path);
diff --git a/src/path.h b/src/path.h
index 14237cb..5927a53 100644
--- a/src/path.h
+++ b/src/path.h
@@ -407,7 +407,7 @@ extern void git_path_iconv_clear(git_path_iconv_t *ic);
* pointer internal iconv buffer if rewrite happened. The `in` pointer
* will be left unchanged if no rewrite was needed.
*/
-extern int git_path_iconv(git_path_iconv_t *ic, char **in, size_t *inlen);
+extern int git_path_iconv(git_path_iconv_t *ic, const char **in, size_t *inlen);
#endif /* GIT_USE_ICONV */