From 0aa1f968d3bdd2e929f1e68e671f7b4f2e9dacd3 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Mon, 21 Mar 2011 13:02:20 +0100
Subject: _stdio.h: move _load_inttype.h and _store_inttype.h prototypes here
Use one common prototype for consistency.
Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
---
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(-)
(limited to 'libc')
diff --git a/libc/stdio/_load_inttype.c b/libc/stdio/_load_inttype.c
index dabb6afa6..8c0a60abe 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 4b1541db1..0adb5f5af 100644
--- a/libc/stdio/_scanf.c
+++ b/libc/stdio/_scanf.c
@@ -90,8 +90,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 b8f5c98a3..94557c257 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 fdd4dce05..7ecfe6ed0 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 a1a7bdd4d..bcbf1ed64 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 f5cce58f1..d85bfde09 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
--
cgit v1.2.3