projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update NEWS.stable
[gnulib.git]
/
lib
/
fnmatch.in.h
diff --git
a/lib/fnmatch.in.h
b/lib/fnmatch.in.h
index
b086b45
..
e06ff03
100644
(file)
--- a/
lib/fnmatch.in.h
+++ b/
lib/fnmatch.in.h
@@
-1,5
+1,5
@@
-/* Copyright (C) 1991
, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-
2005, 2007 Free
Software Foundation, Inc.
+/* Copyright (C) 1991
-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2011 Free
+ Software Foundation, Inc.
This file is part of the GNU C Library.
This file is part of the GNU C Library.
@@
-17,8
+17,10
@@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifndef _FNMATCH_H
-#define _FNMATCH_H 1
+#ifndef _FNMATCH_H
+#define _FNMATCH_H 1
+
+/* The definition of _GL_ARG_NONNULL is copied here. */
#ifdef __cplusplus
extern "C" {
#ifdef __cplusplus
extern "C" {
@@
-26,37
+28,38
@@
extern "C" {
/* We #undef these before defining them because some losing systems
(HP-UX A.08.07 for example) define these in <unistd.h>. */
/* We #undef these before defining them because some losing systems
(HP-UX A.08.07 for example) define these in <unistd.h>. */
-#undef FNM_PATHNAME
-#undef FNM_NOESCAPE
-#undef FNM_PERIOD
+#undef
FNM_PATHNAME
+#undef
FNM_NOESCAPE
+#undef
FNM_PERIOD
/* Bits set in the FLAGS argument to `fnmatch'. */
/* Bits set in the FLAGS argument to `fnmatch'. */
-#define
FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
-#define
FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
-#define
FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
+#define FNM_PATHNAME (1 << 0) /* No wildcard can ever match `/'. */
+#define FNM_NOESCAPE (1 << 1) /* Backslashes don't quote special chars. */
+#define FNM_PERIOD (1 << 2) /* Leading `.' is matched only explicitly. */
#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
-# define FNM_FILE_NAME FNM_PATHNAME /* Preferred GNU name. */
-# define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match. */
-# define FNM_CASEFOLD (1 << 4) /* Compare without regard to case. */
-# define FNM_EXTMATCH (1 << 5) /* Use ksh-like extended matching. */
+# define FNM_FILE_NAME
FNM_PATHNAME /* Preferred GNU name. */
+# define FNM_LEADING_DIR (1 << 3)
/* Ignore `/...' after a match. */
+# define FNM_CASEFOLD
(1 << 4) /* Compare without regard to case. */
+# define FNM_EXTMATCH
(1 << 5) /* Use ksh-like extended matching. */
#endif
/* Value returned by `fnmatch' if STRING does not match PATTERN. */
#endif
/* Value returned by `fnmatch' if STRING does not match PATTERN. */
-#define
FNM_NOMATCH 1
+#define FNM_NOMATCH 1
/* This value is returned if the implementation does not support
`fnmatch'. Since this is not the case here it will never be
returned but the conformance test suites still require the symbol
to be defined. */
#ifdef _XOPEN_SOURCE
/* This value is returned if the implementation does not support
`fnmatch'. Since this is not the case here it will never be
returned but the conformance test suites still require the symbol
to be defined. */
#ifdef _XOPEN_SOURCE
-# define FNM_NOSYS (-1)
+# define FNM_NOSYS
(-1)
#endif
/* Match NAME against the file name pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
extern int fnmatch (const char *__pattern, const char *__name,
#endif
/* Match NAME against the file name pattern PATTERN,
returning zero if it matches, FNM_NOMATCH if not. */
extern int fnmatch (const char *__pattern, const char *__name,
- int __flags);
+ int __flags)
+ _GL_ARG_NONNULL ((1, 2));
#ifdef __cplusplus
}
#ifdef __cplusplus
}