mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'nd/remove-unused' into HEAD
Code cleanup. * nd/remove-unused: wrapper.c: delete dead function git_mkstemps() dir.c: remove dead function fnmatch_icase()
This commit is contained in:
commit
14af79b93d
2
cache.h
2
cache.h
|
@ -958,8 +958,6 @@ static inline int is_empty_blob_sha1(const unsigned char *sha1)
|
|||
|
||||
int git_mkstemp(char *path, size_t n, const char *template);
|
||||
|
||||
int git_mkstemps(char *path, size_t n, const char *template, int suffix_len);
|
||||
|
||||
/* set default permissions by passing mode arguments to open(2) */
|
||||
int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
|
||||
int git_mkstemp_mode(char *pattern, int mode);
|
||||
|
|
7
dir.c
7
dir.c
|
@ -64,13 +64,6 @@ int strncmp_icase(const char *a, const char *b, size_t count)
|
|||
return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
|
||||
}
|
||||
|
||||
int fnmatch_icase(const char *pattern, const char *string, int flags)
|
||||
{
|
||||
return wildmatch(pattern, string,
|
||||
flags | (ignore_case ? WM_CASEFOLD : 0),
|
||||
NULL);
|
||||
}
|
||||
|
||||
int git_fnmatch(const struct pathspec_item *item,
|
||||
const char *pattern, const char *string,
|
||||
int prefix)
|
||||
|
|
1
dir.h
1
dir.h
|
@ -272,7 +272,6 @@ extern int remove_path(const char *path);
|
|||
|
||||
extern int strcmp_icase(const char *a, const char *b);
|
||||
extern int strncmp_icase(const char *a, const char *b, size_t count);
|
||||
extern int fnmatch_icase(const char *pattern, const char *string, int flags);
|
||||
|
||||
/*
|
||||
* The prefix part of pattern must not contains wildcards.
|
||||
|
|
17
wrapper.c
17
wrapper.c
|
@ -446,23 +446,6 @@ int git_mkstemp(char *path, size_t len, const char *template)
|
|||
return mkstemp(path);
|
||||
}
|
||||
|
||||
/* git_mkstemps() - create tmp file with suffix honoring TMPDIR variable. */
|
||||
int git_mkstemps(char *path, size_t len, const char *template, int suffix_len)
|
||||
{
|
||||
const char *tmp;
|
||||
size_t n;
|
||||
|
||||
tmp = getenv("TMPDIR");
|
||||
if (!tmp)
|
||||
tmp = "/tmp";
|
||||
n = snprintf(path, len, "%s/%s", tmp, template);
|
||||
if (len <= n) {
|
||||
errno = ENAMETOOLONG;
|
||||
return -1;
|
||||
}
|
||||
return mkstemps(path, suffix_len);
|
||||
}
|
||||
|
||||
/* Adapted from libiberty's mkstemp.c. */
|
||||
|
||||
#undef TMP_MAX
|
||||
|
|
Loading…
Reference in a new issue