From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 8AB293856DD5; Tue, 10 May 2022 18:29:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8AB293856DD5 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] Use __feof_unlocked instead of feof_unlocked X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: b2bc23731a2b765c0f89f8a0f74fa30ce7c16a2b X-Git-Newrev: 8ccf7c9bcae3625a2bd73b8a7a7c61188612d7c5 Message-Id: <20220510182918.8AB293856DD5@sourceware.org> Date: Tue, 10 May 2022 18:29:18 +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: Tue, 10 May 2022 18:29:18 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8ccf7c9bcae3625a2bd73b8a7a7c61188612d7c5 commit 8ccf7c9bcae3625a2bd73b8a7a7c61188612d7c5 Author: Adhemerval Zanella Date: Thu Mar 31 14:32:51 2022 -0300 Use __feof_unlocked instead of feof_unlocked Diff: --- inet/ruserpass.c | 2 +- nptl/pthread_getattr_np.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inet/ruserpass.c b/inet/ruserpass.c index f6f212ec9f..3e46f9bbaa 100644 --- a/inet/ruserpass.c +++ b/inet/ruserpass.c @@ -217,7 +217,7 @@ token (void) int c; int i; - if (feof_unlocked(cfile) || __ferror_unlocked(cfile)) + if (__feof_unlocked(cfile) || __ferror_unlocked(cfile)) return (0); while ((c = __getc_unlocked(cfile)) != EOF && (c == '\n' || c == '\t' || c == ' ' || c == ',')) diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c index 9c5b73b452..6fd2d1be51 100644 --- a/nptl/pthread_getattr_np.c +++ b/nptl/pthread_getattr_np.c @@ -117,7 +117,7 @@ __pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr) uintptr_t last_to = 0; #endif - while (! feof_unlocked (fp)) + while (! __feof_unlocked (fp)) { if (__getline (&line, &linelen, fp) <= 0) break;