From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2178) id 5183E386F803; Fri, 5 Mar 2021 13:08:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5183E386F803 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] posix: glob, glob64 should not be declared __THROW [BZ #27522] X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 6bb0d2fe0a15ae69f0c351bd2b83a737b8da771f X-Git-Newrev: 3c667926673bac6017bf78569f582f6baee9948f Message-Id: <20210305130857.5183E386F803@sourceware.org> Date: Fri, 5 Mar 2021 13:08:57 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Mar 2021 13:08:57 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3c667926673bac6017bf78569f582f6baee9948f commit 3c667926673bac6017bf78569f582f6baee9948f Author: Florian Weimer Date: Fri Mar 5 12:02:20 2021 +0100 posix: glob, glob64 should not be declared __THROW [BZ #27522] These functions invoke callbacks with GLOB_ALTDIRFUNC, so they are not leaf functions (as implied by _THROW). Use __THROWNL and __REDIRECT_NTHNL to express this. Reviewed-by: Adhemerval Zanella Diff: --- posix/glob.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/posix/glob.h b/posix/glob.h index 71c6b84a8a..b5686600c7 100644 --- a/posix/glob.h +++ b/posix/glob.h @@ -145,15 +145,15 @@ typedef struct #if !defined __USE_FILE_OFFSET64 extern int glob (const char *__restrict __pattern, int __flags, int (*__errfunc) (const char *, int), - glob_t *__restrict __pglob) __THROW; + glob_t *__restrict __pglob) __THROWNL; /* Free storage allocated in PGLOB by a previous `glob' call. */ extern void globfree (glob_t *__pglob) __THROW; #else -extern int __REDIRECT_NTH (glob, (const char *__restrict __pattern, - int __flags, - int (*__errfunc) (const char *, int), - glob_t *__restrict __pglob), glob64); +extern int __REDIRECT_NTHNL (glob, (const char *__restrict __pattern, + int __flags, + int (*__errfunc) (const char *, int), + glob_t *__restrict __pglob), glob64); extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64); #endif @@ -161,7 +161,7 @@ extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64); #ifdef __USE_LARGEFILE64 extern int glob64 (const char *__restrict __pattern, int __flags, int (*__errfunc) (const char *, int), - glob64_t *__restrict __pglob) __THROW; + glob64_t *__restrict __pglob) __THROWNL; extern void globfree64 (glob64_t *__pglob) __THROW; #endif