public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-06-03 14:06 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-06-03 14:06 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7c96452d6f8288ea47d4ff2c13fa938ae1a63f62
commit 7c96452d6f8288ea47d4ff2c13fa938ae1a63f62
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-06-09 21:20 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-06-09 21:20 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=383cd72a88858f0dc6b0af438813feaccf114d89
commit 383cd72a88858f0dc6b0af438813feaccf114d89
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-06-09 13:16 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-06-09 13:16 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=383cd72a88858f0dc6b0af438813feaccf114d89
commit 383cd72a88858f0dc6b0af438813feaccf114d89
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-05-13 14:20 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-05-13 14:20 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=757429215217c38ebe4afa4a4f5dd10959d0cd29
commit 757429215217c38ebe4afa4a4f5dd10959d0cd29
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-05-12 19:33 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-05-12 19:33 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=b5639e345debe4090fffb6ba4f51d5d55bd62398
commit b5639e345debe4090fffb6ba4f51d5d55bd62398
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-05-10 18:24 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-05-10 18:24 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=4f23160415b89fb4919d4f56dedbab6fd7158b8c
commit 4f23160415b89fb4919d4f56dedbab6fd7158b8c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-04-29 14:04 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-04-29 14:04 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=bd2240eda7352ec545410a8e627d9c06dc6bb032
commit bd2240eda7352ec545410a8e627d9c06dc6bb032
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index 51a8d65f22..f1e388523b 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -243,8 +243,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -270,13 +269,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-04-04 12:54 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-04-04 12:54 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=409787bd4f71a538bbcb22bc608cd0782876a4f3
commit 409787bd4f71a538bbcb22bc608cd0782876a4f3
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index f1509888d7..edb8f12e8a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-03-31 19:06 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-03-31 19:06 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7de81025db9c3d7fc7221aeb530116fcb87883a9
commit 7de81025db9c3d7fc7221aeb530116fcb87883a9
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index f1509888d7..edb8f12e8a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-03-29 20:29 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-03-29 20:29 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6884f5b3fbfc0424cf24e591e3c49264c652cc6d
commit 6884f5b3fbfc0424cf24e591e3c49264c652cc6d
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index f1509888d7..edb8f12e8a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-03-16 18:04 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-03-16 18:04 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e1b64397374771f4f5fb4984e3def0284b5fdc4e
commit e1b64397374771f4f5fb4984e3def0284b5fdc4e
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index f1509888d7..edb8f12e8a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
@ 2022-03-15 18:41 Adhemerval Zanella
0 siblings, 0 replies; 12+ messages in thread
From: Adhemerval Zanella @ 2022-03-15 18:41 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=95df46e294bb42bcbaf16137926ffe9ac2993700
commit 95df46e294bb42bcbaf16137926ffe9ac2993700
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Mar 14 15:14:36 2022 -0300
libio: Use __libc_ferror_unlocked instead of __ferror_unlocked
Internal __ferror_unlocked is done using a inline function (regardless
of __USE_EXTERN_INLINES). The internal alias is removed since it is
not used.
Diff:
---
include/stdio.h | 9 ++++-----
libio/ferror_u.c | 3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/include/stdio.h b/include/stdio.h
index f1509888d7..edb8f12e8a 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -242,8 +242,7 @@ libc_hidden_proto (fputs_unlocked)
extern __typeof (fputs_unlocked) __fputs_unlocked;
libc_hidden_proto (__fputs_unlocked)
extern __typeof (feof_unlocked) __libc_feof_unlocked;
-libc_hidden_proto (ferror_unlocked)
-extern __typeof (ferror_unlocked) __ferror_unlocked attribute_hidden;
+extern __typeof (ferror_unlocked) __libc_ferror_unlocked;
libc_hidden_proto (getc_unlocked)
libc_hidden_proto (fputc_unlocked)
libc_hidden_proto (putc_unlocked)
@@ -269,13 +268,13 @@ __feof_unlocked (FILE *__stream)
return __feof_unlocked_body (__stream);
}
-# ifdef __USE_EXTERN_INLINES
-__extern_inline int
-__NTH (__ferror_unlocked (FILE *__stream))
+static inline int
+__ferror_unlocked (FILE *__stream)
{
return __ferror_unlocked_body (__stream);
}
+# ifdef __USE_EXTERN_INLINES
__extern_inline int
__getc_unlocked (FILE *__fp)
{
diff --git a/libio/ferror_u.c b/libio/ferror_u.c
index edba404d32..ea2a97db8f 100644
--- a/libio/ferror_u.c
+++ b/libio/ferror_u.c
@@ -30,10 +30,9 @@
#undef ferror_unlocked
int
-__ferror_unlocked (FILE *fp)
+__libc_ferror_unlocked (FILE *fp)
{
CHECK_FILE (fp, EOF);
return _IO_ferror_unlocked (fp);
}
weak_alias (__ferror_unlocked, ferror_unlocked)
-libc_hidden_weak (ferror_unlocked)
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2022-06-09 21:20 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-03 14:06 [glibc/azanella/clang] libio: Use __libc_ferror_unlocked instead of __ferror_unlocked Adhemerval Zanella
-- strict thread matches above, loose matches on Subject: below --
2022-06-09 21:20 Adhemerval Zanella
2022-06-09 13:16 Adhemerval Zanella
2022-05-13 14:20 Adhemerval Zanella
2022-05-12 19:33 Adhemerval Zanella
2022-05-10 18:24 Adhemerval Zanella
2022-04-29 14:04 Adhemerval Zanella
2022-04-04 12:54 Adhemerval Zanella
2022-03-31 19:06 Adhemerval Zanella
2022-03-29 20:29 Adhemerval Zanella
2022-03-16 18:04 Adhemerval Zanella
2022-03-15 18:41 Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).