aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--conform/data/fmtmsg.h-data1
-rw-r--r--conform/data/ftw.h-data1
-rw-r--r--conform/data/inttypes.h-data4
-rw-r--r--conform/data/math.h-data2
-rw-r--r--conform/data/net/if.h-data1
-rw-r--r--conform/data/netinet/in.h-data6
-rw-r--r--conform/data/signal.h-data2
-rw-r--r--conform/data/sys/socket.h-data6
9 files changed, 30 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 92e86aeca6..1d92318d5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2008-01-15 Ulrich Drepper <drepper@redhat.com>
+ * conform/data/fmtmsg.h-data: Add missing allows.
+ * conform/data/ftw.h-data: Likewise.
+ * conform/data/inttypes.h-data: Likewise.
+ * conform/data/math.h-data: Likewise.
+ * conform/data/signal.h-data: Likewise.
+ * conform/data/net/if.h-data: Likewise.
+ * conform/data/netinet/in.h-data: Likewise.
+ * conform/data/sys/socket.h-data: Likewise.
+
[BZ #5614]
* string/bits/string2.h (__strtok_r_1c): Always update *__NEXTP.
(__strtok_r): Simplify.
diff --git a/conform/data/fmtmsg.h-data b/conform/data/fmtmsg.h-data
index 25be1ec509..da1ed65ac4 100644
--- a/conform/data/fmtmsg.h-data
+++ b/conform/data/fmtmsg.h-data
@@ -59,4 +59,5 @@ macro MM_NOCON
function int fmtmsg (long, const char*, int, const char*, const char*, const char*)
allow *_t
+allow MM_*
#endif
diff --git a/conform/data/ftw.h-data b/conform/data/ftw.h-data
index 229a18a458..81c50070d1 100644
--- a/conform/data/ftw.h-data
+++ b/conform/data/ftw.h-data
@@ -22,4 +22,5 @@ function int nftw (const char*, int (*) (const char *, const struct stat*, int,
allow-header sys/stat.h
allow *_t
+allow FTW*
#endif
diff --git a/conform/data/inttypes.h-data b/conform/data/inttypes.h-data
index 3c13ea9c20..93e4713c95 100644
--- a/conform/data/inttypes.h-data
+++ b/conform/data/inttypes.h-data
@@ -136,6 +136,8 @@ macro INTMAX_C
macro UINTMAX_C
// The following expressions are not entirely correct but the current
-// fnamtch implementation doesn't grok the right form.
+// poorfnmatch implementation doesn't grok the right form.
allow INT*
allow UINT*
+allow PRI[Xa-z]*
+allow SCN[Xa-z]*
diff --git a/conform/data/math.h-data b/conform/data/math.h-data
index eb9a450880..40312effdd 100644
--- a/conform/data/math.h-data
+++ b/conform/data/math.h-data
@@ -357,4 +357,6 @@ allow scalbl
#endif
allow *_t
+// The following expressions are not entirely correct but the current
+// poorfnmatch implementation doesn't grok the right form.
allow FP_*
diff --git a/conform/data/net/if.h-data b/conform/data/net/if.h-data
index 8a462522d1..d019978ab5 100644
--- a/conform/data/net/if.h-data
+++ b/conform/data/net/if.h-data
@@ -12,4 +12,5 @@ function {struct if_nameindex*} if_nameindex (void)
function void if_freenameindex (struct if_nameindex*)
allow *_t
+allow IF_*
#endif
diff --git a/conform/data/netinet/in.h-data b/conform/data/netinet/in.h-data
index 607f97c48a..83e967bfee 100644
--- a/conform/data/netinet/in.h-data
+++ b/conform/data/netinet/in.h-data
@@ -59,7 +59,7 @@ function uint32_t ntohl (uint32_t)
function uint16_t ntohs (uint16_t)
allow-header inttypes.h
-allow-header arpa/inet.h
+allow-header sys/socket.h
constant INET6_ADDRSTRLEN 46
@@ -83,8 +83,12 @@ macro IN6_IS_ADDR_MC_SITELOCAL
macro IN6_IS_ADDR_MC_ORGLOCAL
macro IN6_IS_ADDR_MC_GLOBAL
+allow IMPLINK_*
allow IN_*
+allow IN6_*
+allow INADDR_*
allow IP_*
+allow IPV6_*
allow IPPORT_*
allow IPPROTO_*
allow SOCK_*
diff --git a/conform/data/signal.h-data b/conform/data/signal.h-data
index 22e07fb257..635bdd85c8 100644
--- a/conform/data/signal.h-data
+++ b/conform/data/signal.h-data
@@ -180,6 +180,8 @@ function int sigtimedwait (const sigset_t*, siginfo_t*, const struct timespec*)
function int sigwait (const sigset_t*, int*)
function int sigwaitinfo (const sigset_t*, siginfo_t*)
+// The following expressions are not entirely correct but the current
+// poorfnmatch implementation doesn't grok the right form.
allow SIG*
allow sa_*
allow uc_*
diff --git a/conform/data/sys/socket.h-data b/conform/data/sys/socket.h-data
index 61f30abc82..dd1f265b2b 100644
--- a/conform/data/sys/socket.h-data
+++ b/conform/data/sys/socket.h-data
@@ -118,4 +118,10 @@ allow msg_*
allow cmsg_*
allow l_*
allow SO*
+allow AF_*
+allow CMSG_*
+allow MSG_*
+allow PF_*
+allow SCM_*
+allow SHUT_*
#endif