lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

libio/bits/stdio2.h: Clearly separate declaration from definitions

Browse Source 
Move declarations from libio/bits/stdio.h to existing
libio/bits/stdio2-decl.h. This will enable future use of
__REDIRECT_FORTIFY in place of some __REDIRECT.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Frédéric Bérat
2023-06-28 09:07:26 +02:00
parent ba745eff46
commit 840dc610c8
2 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
libio/bits/stdio2-decl.h
View File

@@ -84,18 +84,55 @@ extern int __obstack_vprintf_chk (struct obstack *__restrict __obstack,
#endif #endif
#if __GLIBC_USE (DEPRECATED_GETS) #if __GLIBC_USE (DEPRECATED_GETS)
extern char *__REDIRECT (__gets_warn, (char *__str), gets)
__wur __warnattr ("please use fgets or getline instead, gets can't "
"specify buffer size");
extern char *__gets_chk (char *__str, size_t) __wur; extern char *__gets_chk (char *__str, size_t) __wur;
#endif #endif
extern char *__REDIRECT (__fgets_alias,
(char *__restrict __s, int __n,
FILE *__restrict __stream), fgets)
__wur __attr_access ((__write_only__, 1, 2));
extern char *__REDIRECT (__fgets_chk_warn,
(char *__restrict __s, size_t __size, int __n,
FILE *__restrict __stream), __fgets_chk)
__wur __warnattr ("fgets called with bigger size than length "
"of destination buffer");
extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n, extern char *__fgets_chk (char *__restrict __s, size_t __size, int __n,
FILE *__restrict __stream) FILE *__restrict __stream)
__wur __attr_access ((__write_only__, 1, 3)); __wur __attr_access ((__write_only__, 1, 3));
extern size_t __REDIRECT (__fread_alias,
(void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream),
fread) __wur;
extern size_t __REDIRECT (__fread_chk_warn,
(void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n,
FILE *__restrict __stream),
__fread_chk)
__wur __warnattr ("fread called with bigger size * nmemb than length "
"of destination buffer");
extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen, extern size_t __fread_chk (void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n, size_t __size, size_t __n,
FILE *__restrict __stream) __wur; FILE *__restrict __stream) __wur;
#ifdef __USE_GNU #ifdef __USE_GNU
extern char *__REDIRECT (__fgets_unlocked_alias,
(char *__restrict __s, int __n,
FILE *__restrict __stream), fgets_unlocked)
__wur __attr_access ((__write_only__, 1, 2));
extern char *__REDIRECT (__fgets_unlocked_chk_warn,
(char *__restrict __s, size_t __size, int __n,
FILE *__restrict __stream), __fgets_unlocked_chk)
__wur __warnattr ("fgets_unlocked called with bigger size than length "
"of destination buffer");
extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size, extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
int __n, FILE *__restrict __stream) int __n, FILE *__restrict __stream)
__wur __attr_access ((__write_only__, 1, 3)); __wur __attr_access ((__write_only__, 1, 3));
@@ -103,6 +140,18 @@ extern char *__fgets_unlocked_chk (char *__restrict __s, size_t __size,
#ifdef __USE_MISC #ifdef __USE_MISC
# undef fread_unlocked # undef fread_unlocked
extern size_t __REDIRECT (__fread_unlocked_alias,
(void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream),
fread_unlocked) __wur;
extern size_t __REDIRECT (__fread_unlocked_chk_warn,
(void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n,
FILE *__restrict __stream),
__fread_unlocked_chk)
__wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
"length of destination buffer");
extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen, extern size_t __fread_unlocked_chk (void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n, size_t __size, size_t __n,
FILE *__restrict __stream) __wur; FILE *__restrict __stream) __wur;

48
libio/bits/stdio2.h
View File

@@ -182,10 +182,6 @@ __NTH (obstack_vprintf (struct obstack *__restrict __obstack,
#endif #endif
#if __GLIBC_USE (DEPRECATED_GETS) #if __GLIBC_USE (DEPRECATED_GETS)
extern char *__REDIRECT (__gets_warn, (char *__str), gets)
__wur __warnattr ("please use fgets or getline instead, gets can't "
"specify buffer size");
__fortify_function __wur char * __fortify_function __wur char *
gets (char *__str) gets (char *__str)
{ {
@@ -195,16 +191,6 @@ gets (char *__str)
} }
#endif #endif
extern char *__REDIRECT (__fgets_alias,
(char *__restrict __s, int __n,
FILE *__restrict __stream), fgets)
__wur __attr_access ((__write_only__, 1, 2));
extern char *__REDIRECT (__fgets_chk_warn,
(char *__restrict __s, size_t __size, int __n,
FILE *__restrict __stream), __fgets_chk)
__wur __warnattr ("fgets called with bigger size than length "
"of destination buffer");
__fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char * __fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char *
fgets (char *__restrict __s, int __n, FILE *__restrict __stream) fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
{ {
@@ -216,18 +202,6 @@ fgets (char *__restrict __s, int __n, FILE *__restrict __stream)
return __fgets_chk (__s, sz, __n, __stream); return __fgets_chk (__s, sz, __n, __stream);
} }
extern size_t __REDIRECT (__fread_alias,
(void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream),
fread) __wur;
extern size_t __REDIRECT (__fread_chk_warn,
(void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n,
FILE *__restrict __stream),
__fread_chk)
__wur __warnattr ("fread called with bigger size * nmemb than length "
"of destination buffer");
__fortify_function __wur size_t __fortify_function __wur size_t
fread (void *__restrict __ptr, size_t __size, size_t __n, fread (void *__restrict __ptr, size_t __size, size_t __n,
FILE *__restrict __stream) FILE *__restrict __stream)
@@ -241,16 +215,6 @@ fread (void *__restrict __ptr, size_t __size, size_t __n,
} }
#ifdef __USE_GNU #ifdef __USE_GNU
extern char *__REDIRECT (__fgets_unlocked_alias,
(char *__restrict __s, int __n,
FILE *__restrict __stream), fgets_unlocked)
__wur __attr_access ((__write_only__, 1, 2));
extern char *__REDIRECT (__fgets_unlocked_chk_warn,
(char *__restrict __s, size_t __size, int __n,
FILE *__restrict __stream), __fgets_unlocked_chk)
__wur __warnattr ("fgets_unlocked called with bigger size than length "
"of destination buffer");
__fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char * __fortify_function __wur __fortified_attr_access (__write_only__, 1, 2) char *
fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream) fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
{ {
@@ -265,18 +229,6 @@ fgets_unlocked (char *__restrict __s, int __n, FILE *__restrict __stream)
#ifdef __USE_MISC #ifdef __USE_MISC
# undef fread_unlocked # undef fread_unlocked
extern size_t __REDIRECT (__fread_unlocked_alias,
(void *__restrict __ptr, size_t __size,
size_t __n, FILE *__restrict __stream),
fread_unlocked) __wur;
extern size_t __REDIRECT (__fread_unlocked_chk_warn,
(void *__restrict __ptr, size_t __ptrlen,
size_t __size, size_t __n,
FILE *__restrict __stream),
__fread_unlocked_chk)
__wur __warnattr ("fread_unlocked called with bigger size * nmemb than "
"length of destination buffer");
__fortify_function __wur size_t __fortify_function __wur size_t
fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n, fread_unlocked (void *__restrict __ptr, size_t __size, size_t __n,
FILE *__restrict __stream) FILE *__restrict __stream)