pwd.h: revert __nonnull markings on putpwent [BZ #18641]

This function actually checks for NULL arguments and the API has been
tenatively documented as using EINVAL in that case.  We can debate
leaving it this way, but it should be done after the pending release.

diff --git a/ChangeLog b/ChangeLog
index 0498847a52f80ade1ae1572eb113fcc4297e1518..cf1efcce19e8271c359d561bdb33d44b07214ed6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27  Mike Frysinger  <vapier@gentoo.org>
+
+       [BZ #18641]
+       * pwd/pwd.h (putpwent): Delete __nonnull markings.
+
 2015-07-27  Andreas Schwab  <schwab@suse.de>
 
        * conform/conformtest.pl (checknamespace): Filter out string

diff --git a/pwd/pwd.h b/pwd/pwd.h
index fcfb2ab0e7b0e93e18ea634d3a29a4ad20828a46..70a051deb160b086b6f0cb3019a85aab04b1412d 100644 (file)
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -100,7 +100,7 @@ extern struct passwd *fgetpwent (FILE *__stream) __nonnull ((1));
    or due to the implementation it is a cancellation point and
    therefore not marked with __THROW.  */
 extern int putpwent (const struct passwd *__restrict __p,
-                    FILE *__restrict __f) __nonnull ((1, 2));
+                    FILE *__restrict __f);
 #endif
 
 /* Search for an entry with a matching user ID.