From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 5728B385840C for ; Mon, 29 May 2023 13:58:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5728B385840C Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685368721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=70xus/UQf3XnBktJ0B6Svnjvy/QLd3Q3uDHSYrYdOr4=; b=IfyPj2uXudiWSJXsTTVY6Hiid7yN7yYGPr193m+EzM5XfxS6+uAyyDS8/ZwoQGXkzSj/A+ su4F0Gxy6dvahdGiPnmGmmvTEh0bSV/WYLc6GbLRagn99LWy9Nm6PAlovqz/eIfrJbLdTQ DrUIgPUJpGhC6+ejH9eqNLfXQuggZSs= Received: from mail-yw1-f198.google.com (mail-yw1-f198.google.com [209.85.128.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-290-krkS_yCpPRSKVjebnZMmSQ-1; Mon, 29 May 2023 09:58:39 -0400 X-MC-Unique: krkS_yCpPRSKVjebnZMmSQ-1 Received: by mail-yw1-f198.google.com with SMTP id 00721157ae682-56536dd5f79so77754287b3.3 for ; Mon, 29 May 2023 06:58:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685368719; x=1687960719; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=70xus/UQf3XnBktJ0B6Svnjvy/QLd3Q3uDHSYrYdOr4=; b=gpHrVKeL2d9qK/e1wTNj5mQZ+2QNK58BOwTmwHUuEZLTphgaPiIl1XJ/eiw9LYE+1V C7HM3gn2ROWH681vmRph0bAf4kZIa/OGtxMJcxk8L5kRcRcl1eMi6PppbWSco9QZ9+bc jwgcLY3i8m51yDb/BlD3THEIJsB01uGTb76c3xdS9cWMMSUlrApKnfQ9TzasuvTEP9T7 +g0NeqQj0LAqyJTEA9Q7eBqxdtTglq6j1Se8FGUeOOu4CW0bpdnwj4wRzXl3aFGmJgmj 5IaANYLhDzW+939Seurx2TTVZNJdnLM79q1vlrlePOuhuENKjMM/dwRq95oA7rjVrK4G ZvRw== X-Gm-Message-State: AC+VfDzFAAMK7L7fUIZrLPvdoQIIae2VPbubVNJzBsRVCtvvpJi2UVa7 NSCTCXul9M1kt5u3Ozdm6RwrVdR2uWwbg1ThAUTKttqQ5LVRAoTUI/r7uQw4CN3iethTd9LxIXC 8KEWSIrhJKiDYTof8ejJF X-Received: by 2002:a81:4fd5:0:b0:565:b4e9:74a7 with SMTP id d204-20020a814fd5000000b00565b4e974a7mr11619055ywb.47.1685368719080; Mon, 29 May 2023 06:58:39 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5aKSuMPZbsFHdCezslV+aSVo7kpsqftTe3xTHh3A03ucz8JVmVdIBDeiJHzYj4dgkuq5pV/A== X-Received: by 2002:a81:4fd5:0:b0:565:b4e9:74a7 with SMTP id d204-20020a814fd5000000b00565b4e974a7mr11619031ywb.47.1685368718672; Mon, 29 May 2023 06:58:38 -0700 (PDT) Received: from [192.168.0.241] ([198.48.244.52]) by smtp.gmail.com with ESMTPSA id f4-20020a0ddc04000000b0054f9e7fed7asm10245ywe.137.2023.05.29.06.58.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 29 May 2023 06:58:38 -0700 (PDT) Message-ID: <092bae7e-6e7b-d832-39ec-debb0ee6cfb8@redhat.com> Date: Mon, 29 May 2023 09:58:37 -0400 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v2] libio: Add nonnull attribute for most FILE * arguments in stdio.h To: Xi Ruoyao , libc-alpha@sourceware.org Cc: Adhemerval Zanella Netto , Alex Colomar References: <20230519051940.17458-1-xry111@xry111.site> From: Carlos O'Donell Organization: Red Hat In-Reply-To: <20230519051940.17458-1-xry111@xry111.site> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On 5/19/23 01:19, Xi Ruoyao wrote: > During the review of a GCC analyzer test case, we found most stdio > functions accepting a FILE * argument expect it to be nonnull and just > segfault when the argument is NULL. Add nonnull attribute for them. > > fflush and fflush_unlocked are well defined when __stream is NULL so > they are not touched. > > For fputs, fgets, fread, fwrite, fprintf, vfprintf, and their unlocked > version, if __stream is empty but there is nothing to read or write, > they don't segfault and I'm not sure if the standard allows such a use > so I left them out. May you please provided Signed-off-by for DCO or explain your FSF copyright assignment? > --- > libio/stdio.h | 118 ++++++++++++++++++++++++++------------------------ > 1 file changed, 62 insertions(+), 56 deletions(-) > > diff --git a/libio/stdio.h b/libio/stdio.h > index 4cf9f1c012..49ba361931 100644 > --- a/libio/stdio.h > +++ b/libio/stdio.h > @@ -278,7 +278,7 @@ extern FILE *__REDIRECT (fopen, (const char *__restrict __filename, > extern FILE *__REDIRECT (freopen, (const char *__restrict __filename, > const char *__restrict __modes, > FILE *__restrict __stream), freopen64) > - __wur; > + __wur __nonnull ((3)); > # else > # define fopen fopen64 > # define freopen freopen64 > @@ -330,21 +330,22 @@ extern __FILE *open_wmemstream (wchar_t **__bufloc, size_t *__sizeloc) __THROW > > /* If BUF is NULL, make STREAM unbuffered. > Else make it use buffer BUF, of size BUFSIZ. */ > -extern void setbuf (FILE *__restrict __stream, char *__restrict __buf) __THROW; > +extern void setbuf (FILE *__restrict __stream, char *__restrict __buf) __THROW > + __nonnull ((1)); > /* Make STREAM use buffering mode MODE. > If BUF is not NULL, use N bytes of it for buffering; > else allocate an internal buffer N bytes long. */ > extern int setvbuf (FILE *__restrict __stream, char *__restrict __buf, > - int __modes, size_t __n) __THROW; > + int __modes, size_t __n) __THROW __nonnull ((1)); > > #ifdef __USE_MISC > /* If BUF is NULL, make STREAM unbuffered. > Else make it use SIZE bytes of BUF for buffering. */ > extern void setbuffer (FILE *__restrict __stream, char *__restrict __buf, > - size_t __size) __THROW; > + size_t __size) __THROW __nonnull ((1)); > > /* Make STREAM line-buffered. */ > -extern void setlinebuf (FILE *__stream) __THROW; > +extern void setlinebuf (FILE *__stream) __THROW __nonnull ((1)); > #endif > > > @@ -418,7 +419,7 @@ extern int dprintf (int __fd, const char *__restrict __fmt, ...) > This function is a possible cancellation point and therefore not > marked with __THROW. */ > extern int fscanf (FILE *__restrict __stream, > - const char *__restrict __format, ...) __wur; > + const char *__restrict __format, ...) __wur __nonnull ((1)); > /* Read formatted input from stdin. > > This function is a possible cancellation point and therefore not > @@ -439,7 +440,7 @@ extern int sscanf (const char *__restrict __s, > # ifdef __REDIRECT > extern int __REDIRECT (fscanf, (FILE *__restrict __stream, > const char *__restrict __format, ...), > - __isoc23_fscanf) __wur; > + __isoc23_fscanf) __wur __nonnull ((1)); > extern int __REDIRECT (scanf, (const char *__restrict __format, ...), > __isoc23_scanf) __wur; > extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s, > @@ -447,7 +448,7 @@ extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s, > __isoc23_sscanf); > # else > extern int __isoc23_fscanf (FILE *__restrict __stream, > - const char *__restrict __format, ...) __wur; > + const char *__restrict __format, ...) __wur __nonnull ((1)); > extern int __isoc23_scanf (const char *__restrict __format, ...) __wur; > extern int __isoc23_sscanf (const char *__restrict __s, > const char *__restrict __format, ...) __THROW; > @@ -459,7 +460,7 @@ extern int __isoc23_sscanf (const char *__restrict __s, > # ifdef __REDIRECT > extern int __REDIRECT (fscanf, (FILE *__restrict __stream, > const char *__restrict __format, ...), > - __isoc99_fscanf) __wur; > + __isoc99_fscanf) __wur __nonnull ((1)); > extern int __REDIRECT (scanf, (const char *__restrict __format, ...), > __isoc99_scanf) __wur; > extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s, > @@ -467,7 +468,7 @@ extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s, > __isoc99_sscanf); > # else > extern int __isoc99_fscanf (FILE *__restrict __stream, > - const char *__restrict __format, ...) __wur; > + const char *__restrict __format, ...) __wur __nonnull ((1)); > extern int __isoc99_scanf (const char *__restrict __format, ...) __wur; > extern int __isoc99_sscanf (const char *__restrict __s, > const char *__restrict __format, ...) __THROW; > @@ -485,7 +486,7 @@ extern int __isoc99_sscanf (const char *__restrict __s, > marked with __THROW. */ > extern int vfscanf (FILE *__restrict __s, const char *__restrict __format, > __gnuc_va_list __arg) > - __attribute__ ((__format__ (__scanf__, 2, 0))) __wur; > + __attribute__ ((__format__ (__scanf__, 2, 0))) __wur __nonnull ((1)); > > /* Read formatted input from stdin into argument list ARG. > > @@ -508,7 +509,7 @@ extern int __REDIRECT (vfscanf, > (FILE *__restrict __s, > const char *__restrict __format, __gnuc_va_list __arg), > __isoc23_vfscanf) > - __attribute__ ((__format__ (__scanf__, 2, 0))) __wur; > + __attribute__ ((__format__ (__scanf__, 2, 0))) __wur __nonnull ((1)); > extern int __REDIRECT (vscanf, (const char *__restrict __format, > __gnuc_va_list __arg), __isoc23_vscanf) > __attribute__ ((__format__ (__scanf__, 1, 0))) __wur; > @@ -520,7 +521,7 @@ extern int __REDIRECT_NTH (vsscanf, > # elif !defined __REDIRECT > extern int __isoc23_vfscanf (FILE *__restrict __s, > const char *__restrict __format, > - __gnuc_va_list __arg) __wur; > + __gnuc_va_list __arg) __wur __nonnull ((1)); > extern int __isoc23_vscanf (const char *__restrict __format, > __gnuc_va_list __arg) __wur; > extern int __isoc23_vsscanf (const char *__restrict __s, > @@ -537,7 +538,7 @@ extern int __REDIRECT (vfscanf, > (FILE *__restrict __s, > const char *__restrict __format, __gnuc_va_list __arg), > __isoc99_vfscanf) > - __attribute__ ((__format__ (__scanf__, 2, 0))) __wur; > + __attribute__ ((__format__ (__scanf__, 2, 0))) __wur __nonnull ((1)); > extern int __REDIRECT (vscanf, (const char *__restrict __format, > __gnuc_va_list __arg), __isoc99_vscanf) > __attribute__ ((__format__ (__scanf__, 1, 0))) __wur; > @@ -549,7 +550,7 @@ extern int __REDIRECT_NTH (vsscanf, > # elif !defined __REDIRECT > extern int __isoc99_vfscanf (FILE *__restrict __s, > const char *__restrict __format, > - __gnuc_va_list __arg) __wur; > + __gnuc_va_list __arg) __wur __nonnull ((1)); > extern int __isoc99_vscanf (const char *__restrict __format, > __gnuc_va_list __arg) __wur; > extern int __isoc99_vsscanf (const char *__restrict __s, > @@ -568,8 +569,8 @@ extern int __isoc99_vsscanf (const char *__restrict __s, > > These functions are possible cancellation points and therefore not > marked with __THROW. */ > -extern int fgetc (FILE *__stream); > -extern int getc (FILE *__stream); > +extern int fgetc (FILE *__stream) __nonnull ((1)); > +extern int getc (FILE *__stream) __nonnull ((1)); > > /* Read a character from stdin. > > @@ -582,7 +583,7 @@ extern int getchar (void); > > These functions are possible cancellation points and therefore not > marked with __THROW. */ > -extern int getc_unlocked (FILE *__stream); > +extern int getc_unlocked (FILE *__stream) __nonnull ((1)); > extern int getchar_unlocked (void); > #endif /* Use POSIX. */ > > @@ -593,7 +594,7 @@ extern int getchar_unlocked (void); > cancellation point. But due to similarity with an POSIX interface > or due to the implementation it is a cancellation point and > therefore not marked with __THROW. */ > -extern int fgetc_unlocked (FILE *__stream); > +extern int fgetc_unlocked (FILE *__stream) __nonnull ((1)); > #endif /* Use MISC. */ > > > @@ -604,8 +605,8 @@ extern int fgetc_unlocked (FILE *__stream); > > These functions is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int fputc (int __c, FILE *__stream); > -extern int putc (int __c, FILE *__stream); > +extern int fputc (int __c, FILE *__stream) __nonnull ((2)); > +extern int putc (int __c, FILE *__stream) __nonnull ((2)); > > /* Write a character to stdout. > > @@ -620,7 +621,7 @@ extern int putchar (int __c); > cancellation point. But due to similarity with an POSIX interface > or due to the implementation it is a cancellation point and > therefore not marked with __THROW. */ > -extern int fputc_unlocked (int __c, FILE *__stream); > +extern int fputc_unlocked (int __c, FILE *__stream) __nonnull ((2)); > #endif /* Use MISC. */ > > #ifdef __USE_POSIX199506 > @@ -628,7 +629,7 @@ extern int fputc_unlocked (int __c, FILE *__stream); > > These functions are possible cancellation points and therefore not > marked with __THROW. */ > -extern int putc_unlocked (int __c, FILE *__stream); > +extern int putc_unlocked (int __c, FILE *__stream) __nonnull ((2)); > extern int putchar_unlocked (int __c); > #endif /* Use POSIX. */ > > @@ -636,10 +637,10 @@ extern int putchar_unlocked (int __c); > #if defined __USE_MISC \ > || (defined __USE_XOPEN && !defined __USE_XOPEN2K) > /* Get a word (int) from STREAM. */ > -extern int getw (FILE *__stream); > +extern int getw (FILE *__stream) __nonnull ((1)); > > /* Write a word (int) to STREAM. */ > -extern int putw (int __w, FILE *__stream); > +extern int putw (int __w, FILE *__stream) __nonnull ((2)); > #endif > > > @@ -689,10 +690,10 @@ extern char *fgets_unlocked (char *__restrict __s, int __n, > therefore not marked with __THROW. */ > extern __ssize_t __getdelim (char **__restrict __lineptr, > size_t *__restrict __n, int __delimiter, > - FILE *__restrict __stream) __wur; > + FILE *__restrict __stream) __wur __nonnull ((4)); > extern __ssize_t getdelim (char **__restrict __lineptr, > size_t *__restrict __n, int __delimiter, > - FILE *__restrict __stream) __wur; > + FILE *__restrict __stream) __wur __nonnull ((4)); > > /* Like `getdelim', but reads up to a newline. > > @@ -702,7 +703,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, > therefore not marked with __THROW. */ > extern __ssize_t getline (char **__restrict __lineptr, > size_t *__restrict __n, > - FILE *__restrict __stream) __wur; > + FILE *__restrict __stream) __wur __nonnull ((3)); > #endif > > > @@ -723,7 +724,7 @@ extern int puts (const char *__s); > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int ungetc (int __c, FILE *__stream); > +extern int ungetc (int __c, FILE *__stream) __nonnull ((2)); > > > /* Read chunks of generic data from STREAM. > @@ -768,17 +769,17 @@ extern size_t fwrite_unlocked (const void *__restrict __ptr, size_t __size, > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int fseek (FILE *__stream, long int __off, int __whence); > +extern int fseek (FILE *__stream, long int __off, int __whence) __nonnull ((1)); > /* Return the current position of STREAM. > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern long int ftell (FILE *__stream) __wur; > +extern long int ftell (FILE *__stream) __wur __nonnull ((1)); > /* Rewind to the beginning of STREAM. > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern void rewind (FILE *__stream); > +extern void rewind (FILE *__stream) __nonnull ((1)); > > /* The Single Unix Specification, Version 2, specifies an alternative, > more adequate interface for the two functions above which deal with > @@ -791,18 +792,19 @@ extern void rewind (FILE *__stream); > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int fseeko (FILE *__stream, __off_t __off, int __whence); > +extern int fseeko (FILE *__stream, __off_t __off, int __whence) __nonnull ((1)); > /* Return the current position of STREAM. > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern __off_t ftello (FILE *__stream) __wur; > +extern __off_t ftello (FILE *__stream) __wur __nonnull ((1)); > # else > # ifdef __REDIRECT > extern int __REDIRECT (fseeko, > (FILE *__stream, __off64_t __off, int __whence), > - fseeko64); > -extern __off64_t __REDIRECT (ftello, (FILE *__stream), ftello64); > + fseeko64) __nonnull ((1)); > +extern __off64_t __REDIRECT (ftello, (FILE *__stream), ftello64) > + __nonnull ((1)); > # else > # define fseeko fseeko64 > # define ftello ftello64 > @@ -815,18 +817,20 @@ extern __off64_t __REDIRECT (ftello, (FILE *__stream), ftello64); > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos); > +extern int fgetpos (FILE *__restrict __stream, fpos_t *__restrict __pos) > + __nonnull ((1)); > /* Set STREAM's position. > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int fsetpos (FILE *__stream, const fpos_t *__pos); > +extern int fsetpos (FILE *__stream, const fpos_t *__pos) __nonnull ((1)); > #else > # ifdef __REDIRECT > extern int __REDIRECT (fgetpos, (FILE *__restrict __stream, > - fpos_t *__restrict __pos), fgetpos64); > + fpos_t *__restrict __pos), fgetpos64) __nonnull ((1)); > extern int __REDIRECT (fsetpos, > - (FILE *__stream, const fpos_t *__pos), fsetpos64); > + (FILE *__stream, const fpos_t *__pos), fsetpos64) > + __nonnull ((1)); > # else > # define fgetpos fgetpos64 > # define fsetpos fsetpos64 > @@ -834,24 +838,26 @@ extern int __REDIRECT (fsetpos, > #endif > > #ifdef __USE_LARGEFILE64 > -extern int fseeko64 (FILE *__stream, __off64_t __off, int __whence); > -extern __off64_t ftello64 (FILE *__stream) __wur; > -extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos); > -extern int fsetpos64 (FILE *__stream, const fpos64_t *__pos); > +extern int fseeko64 (FILE *__stream, __off64_t __off, int __whence) > + __nonnull ((1)); > +extern __off64_t ftello64 (FILE *__stream) __wur __nonnull ((1)); > +extern int fgetpos64 (FILE *__restrict __stream, fpos64_t *__restrict __pos) > + __nonnull ((1)); > +extern int fsetpos64 (FILE *__stream, const fpos64_t *__pos) __nonnull ((1)); > #endif > > /* Clear the error and EOF indicators for STREAM. */ > -extern void clearerr (FILE *__stream) __THROW; > +extern void clearerr (FILE *__stream) __THROW __nonnull ((1)); > /* Return the EOF indicator for STREAM. */ > -extern int feof (FILE *__stream) __THROW __wur; > +extern int feof (FILE *__stream) __THROW __wur __nonnull ((1)); > /* Return the error indicator for STREAM. */ > -extern int ferror (FILE *__stream) __THROW __wur; > +extern int ferror (FILE *__stream) __THROW __wur __nonnull ((1)); > > #ifdef __USE_MISC > /* Faster versions when locking is not required. */ > -extern void clearerr_unlocked (FILE *__stream) __THROW; > -extern int feof_unlocked (FILE *__stream) __THROW __wur; > -extern int ferror_unlocked (FILE *__stream) __THROW __wur; > +extern void clearerr_unlocked (FILE *__stream) __THROW __nonnull ((1)); > +extern int feof_unlocked (FILE *__stream) __THROW __wur __nonnull ((1)); > +extern int ferror_unlocked (FILE *__stream) __THROW __wur __nonnull ((1)); > #endif > > > @@ -864,12 +870,12 @@ extern void perror (const char *__s) __COLD; > > #ifdef __USE_POSIX > /* Return the system file descriptor for STREAM. */ > -extern int fileno (FILE *__stream) __THROW __wur; > +extern int fileno (FILE *__stream) __THROW __wur __nonnull ((1)); > #endif /* Use POSIX. */ > > #ifdef __USE_MISC > /* Faster version when locking is not required. */ > -extern int fileno_unlocked (FILE *__stream) __THROW __wur; > +extern int fileno_unlocked (FILE *__stream) __THROW __wur __nonnull ((1)); > #endif > > > @@ -878,7 +884,7 @@ extern int fileno_unlocked (FILE *__stream) __THROW __wur; > > This function is a possible cancellation point and therefore not > marked with __THROW. */ > -extern int pclose (FILE *__stream); > +extern int pclose (FILE *__stream) __nonnull ((1)); > > /* Create a new stream connected to a pipe running the given command. > > @@ -922,14 +928,14 @@ extern int obstack_vprintf (struct obstack *__restrict __obstack, > /* These are defined in POSIX.1:1996. */ > > /* Acquire ownership of STREAM. */ > -extern void flockfile (FILE *__stream) __THROW; > +extern void flockfile (FILE *__stream) __THROW __nonnull ((1)); > > /* Try to acquire ownership of STREAM but do not block if it is not > possible. */ > -extern int ftrylockfile (FILE *__stream) __THROW __wur; > +extern int ftrylockfile (FILE *__stream) __THROW __wur __nonnull ((1)); > > /* Relinquish the ownership granted for STREAM. */ > -extern void funlockfile (FILE *__stream) __THROW; > +extern void funlockfile (FILE *__stream) __THROW __nonnull ((1)); > #endif /* POSIX */ > > #if defined __USE_XOPEN && !defined __USE_XOPEN2K && !defined __USE_GNU -- Cheers, Carlos.