From bab00aef25c236cd0b910fa70465854d94cdbf0e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Thu, 20 Aug 2009 08:21:46 -0600 Subject: [PATCH] build: avoid some compiler warnings * lib/selinux-at.h: Use dir_fd, not dirfd, to avoid shadowing. * lib/exclude.c (fnmatch_pattern_has_wildcards): Use correct type. (new_exclude_segment, excluded_file_pattern_p) (excluded_file_name_p): Reduce scope. * lib/vasnprintf.c (decimal_point_char): Avoid warning on old-style declaration. Signed-off-by: Eric Blake --- ChangeLog | 11 +++++++++++ lib/exclude.c | 8 ++++---- lib/selinux-at.h | 20 ++++++++++---------- lib/vasnprintf.c | 2 +- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index d50fcb087..23a923828 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-08-20 Eric Blake + + build: avoid some compiler warnings + * lib/selinux-at.h: Use dir_fd, not dirfd, to avoid shadowing. + * lib/exclude.c (fnmatch_pattern_has_wildcards): Use correct + type. + (new_exclude_segment, excluded_file_pattern_p) + (excluded_file_name_p): Reduce scope. + * lib/vasnprintf.c (decimal_point_char): Avoid warning on + old-style declaration. + 2009-08-20 Simon Josefsson * tests/test-exclude1.sh: Handle Windows EOL. diff --git a/lib/exclude.c b/lib/exclude.c index d4baab51c..32f2a0a3e 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -113,7 +113,7 @@ struct exclude bool fnmatch_pattern_has_wildcards (const char *str, int options) { - char *cset = "\\?*[]"; + const char *cset = "\\?*[]"; if (options & FNM_NOESCAPE) cset++; while (*str) @@ -199,7 +199,7 @@ string_free (void *data) /* Create new exclude segment of given TYPE and OPTIONS, and attach it to the tail of list in EX */ -struct exclude_segment * +static struct exclude_segment * new_exclude_segment (struct exclude *ex, enum exclude_type type, int options) { struct exclude_segment *sp = xzalloc (sizeof (struct exclude_segment)); @@ -328,7 +328,7 @@ exclude_fnmatch (char const *pattern, char const *f, int options) /* Return true if the exclude_pattern segment SEG excludes F. */ -bool +static bool excluded_file_pattern_p (struct exclude_segment const *seg, char const *f) { size_t exclude_count = seg->v.pat.exclude_count; @@ -350,7 +350,7 @@ excluded_file_pattern_p (struct exclude_segment const *seg, char const *f) /* Return true if the exclude_hash segment SEG excludes F. BUFFER is an auxiliary storage of the same length as F (with nul terminator included) */ -bool +static bool excluded_file_name_p (struct exclude_segment const *seg, char const *f, char *buffer) { diff --git a/lib/selinux-at.h b/lib/selinux-at.h index 9716fe9e5..1d84c197a 100644 --- a/lib/selinux-at.h +++ b/lib/selinux-at.h @@ -20,33 +20,33 @@ /* These are the dir-fd-relative variants of the functions without the "at" suffix. For example, getfileconat (AT_FDCWD, file, &c) is usually equivalent to getfilecon (file, &c). The emulation is accomplished - by first attempting getfilecon ("/proc/self/fd/DIRFD/FILE", &c). + by first attempting getfilecon ("/proc/self/fd/DIR_FD/FILE", &c). Failing that, simulate it via save_cwd/fchdir/getfilecon/restore_cwd. If either the save_cwd or the restore_cwd fails (relatively unlikely), then give a diagnostic and exit nonzero. */ /* dir-fd-relative getfilecon. Set *CON to the SELinux security context - of the file specified by DIRFD and FILE and return the length of *CON. - DIRFD and FILE are interpreted as for fstatat[*]. A non-NULL *CON + of the file specified by DIR_FD and FILE and return the length of *CON. + DIR_FD and FILE are interpreted as for fstatat[*]. A non-NULL *CON must be freed with freecon. Upon error, set *CON to NULL, set errno and return -1. [*] with flags=0 here, with flags=AT_SYMLINK_NOFOLLOW for lgetfileconat */ -int getfileconat (int dirfd, char const *file, security_context_t *con); +int getfileconat (int dir_fd, char const *file, security_context_t *con); /* dir-fd-relative lgetfilecon. This function is just like getfileconat, - except when DIRFD and FILE specify a symlink: lgetfileconat operates on + except when DIR_FD and FILE specify a symlink: lgetfileconat operates on the symlink, while getfileconat operates on the referent of the symlink. */ -int lgetfileconat (int dirfd, char const *file, security_context_t *con); +int lgetfileconat (int dir_fd, char const *file, security_context_t *con); /* dir-fd-relative setfilecon. Set the SELinux security context of - the file specified by DIRFD and FILE to CON. DIRFD and FILE are + the file specified by DIR_FD and FILE to CON. DIR_FD and FILE are interpreted as for fstatat[*]. Upon success, return 0. Otherwise, return -1 and set errno. */ -int setfileconat (int dirfd, char const *file, security_context_t con); +int setfileconat (int dir_fd, char const *file, security_context_t con); /* dir-fd-relative lsetfilecon. This function is just like setfileconat, except that rather than dereferencing a symlink, this function affects it. */ /* dir-fd-relative lsetfilecon. This function is just like setfileconat, - except when DIRFD and FILE specify a symlink: lsetfileconat operates on + except when DIR_FD and FILE specify a symlink: lsetfileconat operates on the symlink, while setfileconat operates on the referent of the symlink. */ -int lsetfileconat (int dirfd, char const *file, security_context_t con); +int lsetfileconat (int dir_fd, char const *file, security_context_t con); diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c index bff204b86..661445cb4 100644 --- a/lib/vasnprintf.c +++ b/lib/vasnprintf.c @@ -257,7 +257,7 @@ local_wcsnlen (const wchar_t *s, size_t maxlen) # ifndef decimal_point_char_defined # define decimal_point_char_defined 1 static char -decimal_point_char () +decimal_point_char (void) { const char *point; /* Determine it in a multithread-safe way. We know nl_langinfo is -- 2.11.0