From patchwork Tue Jul 28 03:47:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 7882 X-Patchwork-Delegate: vapier@gentoo.org Received: (qmail 15566 invoked by alias); 28 Jul 2015 03:47:11 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 15514 invoked by uid 89); 28 Jul 2015 03:47:10 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org From: Mike Frysinger To: libc-alpha@sourceware.org Subject: [PATCH/committed] pwd.h: revert __nonnull markings on putpwent [BZ #18641] Date: Mon, 27 Jul 2015 23:47:07 -0400 Message-Id: <1438055227-17694-1-git-send-email-vapier@gentoo.org> In-Reply-To: <20150530173322.GG2101@vapier> References: <20150530173322.GG2101@vapier> 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. --- ChangeLog | 5 +++++ pwd/pwd.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0498847..cf1efcc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-07-27 Mike Frysinger + + [BZ #18641] + * pwd/pwd.h (putpwent): Delete __nonnull markings. + 2015-07-27 Andreas Schwab * conform/conformtest.pl (checknamespace): Filter out string diff --git a/pwd/pwd.h b/pwd/pwd.h index fcfb2ab..70a051d 100644 --- 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.