[git commit future 1/1] _stdio.h: move _load_inttype.h and _store_inttype.h prototypes here

Khem Raj raj.khem at gmail.com
Sat Mar 19 18:51:25 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=e6e595eccb649ebce357047852947d91a9a3300a
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future

Use one common prototype for consistency.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 libc/stdio/_load_inttype.c  |    1 -
 libc/stdio/_scanf.c         |    2 --
 libc/stdio/_stdio.h         |    3 +++
 libc/stdio/_store_inttype.c |    1 -
 libc/stdio/_vfprintf.c      |    3 ---
 libc/stdio/old_vfprintf.c   |    3 ---
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/libc/stdio/_load_inttype.c b/libc/stdio/_load_inttype.c
index 057f5f2..2dd559a 100644
--- a/libc/stdio/_load_inttype.c
+++ b/libc/stdio/_load_inttype.c
@@ -8,7 +8,6 @@
 #include "_stdio.h"
 #include <printf.h>
 
-uintmax_t _load_inttype(int desttype, register const void *src, int uflag) attribute_hidden;
 uintmax_t _load_inttype(int desttype, register const void *src, int uflag)
 {
 	if (uflag >= 0) {			/* unsigned */
diff --git a/libc/stdio/_scanf.c b/libc/stdio/_scanf.c
index 6a4d933..fb08548 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -98,8 +98,6 @@ typedef struct {
 
 #endif
 
-extern void _store_inttype(void *dest, int desttype, uintmax_t val);
-
 #if defined(ULLONG_MAX) && (LLONG_MAX > LONG_MAX)
 
 extern unsigned long long
diff --git a/libc/stdio/_stdio.h b/libc/stdio/_stdio.h
index b8f5c98..94557c2 100644
--- a/libc/stdio/_stdio.h
+++ b/libc/stdio/_stdio.h
@@ -312,6 +312,9 @@ extern int __stdio_trans2w(FILE *__restrict stream) attribute_hidden;
 extern int __stdio_trans2r_o(FILE *__restrict stream, int oflag) attribute_hidden;
 extern int __stdio_trans2w_o(FILE *__restrict stream, int oflag) attribute_hidden;
 
+extern uintmax_t _load_inttype(int desttype, register const void *src, int uflag) attribute_hidden;
+extern void _store_inttype(void *dest, int desttype, uintmax_t val) attribute_hidden;
+
 /**********************************************************************/
 #ifdef __STDIO_BUFFERS
 
diff --git a/libc/stdio/_store_inttype.c b/libc/stdio/_store_inttype.c
index fdd4dce..7ecfe6e 100644
--- a/libc/stdio/_store_inttype.c
+++ b/libc/stdio/_store_inttype.c
@@ -28,7 +28,6 @@
 
 /* We assume int may be short or long, but short and long are different. */
 
-void _store_inttype(register void *dest, int desttype, uintmax_t val) attribute_hidden;
 void _store_inttype(register void *dest, int desttype, uintmax_t val)
 {
 	if (desttype == __PA_FLAG_CHAR) { /* assume char not int */
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
index a1a7bdd..bcbf1ed 100644
--- a/libc/stdio/_vfprintf.c
+++ b/libc/stdio/_vfprintf.c
@@ -410,9 +410,6 @@ extern void _ppfs_prepargs(ppfs_t *ppfs, va_list arg) attribute_hidden; /* sets
 extern void _ppfs_setargs(ppfs_t *ppfs) attribute_hidden; /* sets argptrs for current spec */
 extern int _ppfs_parsespec(ppfs_t *ppfs) attribute_hidden; /* parses specifier */
 
-extern void _store_inttype(void *dest, int desttype, uintmax_t val) attribute_hidden;
-extern uintmax_t _load_inttype(int desttype, const void *src, int uflag) attribute_hidden;
-
 /**********************************************************************/
 #ifdef L_parse_printf_format
 
diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c
index f5cce58..d85bfde 100644
--- a/libc/stdio/old_vfprintf.c
+++ b/libc/stdio/old_vfprintf.c
@@ -257,9 +257,6 @@ static const char spec[] = "+-#0 ";
 
 /**********************************************************************/
 
-extern void _store_inttype(void *dest, int desttype, uintmax_t val) attribute_hidden;
-extern uintmax_t _load_inttype(int desttype, const void *src, int uflag) attribute_hidden;
-
 /*
  * In order to ease translation to what arginfo and _print_info._flags expect,
  * we map:  0:int  1:char  2:longlong 4:long  8:short
-- 
1.7.3.4



More information about the uClibc-cvs mailing list