Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed %Ld handling to be int64 as it is on BeOS.

Browse Source 
%lld is now int64 as well.
Cleaned up a little bit (removed K&R style prototypes).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1671 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2002-10-26 00:48:50 +00:00
parent a3b20c0fa9
commit 38903f032b
1 changed files with 30 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/kernel/libroot/posix/stdio/vfprintf.c
View File

@ -40,7 +40,7 @@
* This code is large and complicated... * This code is large and complicated...
*/ */
#include <ktypes.h> #include <sys/types.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -48,9 +48,9 @@
#include <errno.h> #include <errno.h>
#ifdef __STDC__ #ifdef __STDC__
#include <stdarg.h> # include <stdarg.h>
#else #else
#include <varargs.h> # include <varargs.h>
#endif #endif
#include "local.h" #include "local.h"
@ -65,33 +65,31 @@ static int __grow_type_table (unsigned char **typetable,
* Flush out all the vectors defined by the given uio, * Flush out all the vectors defined by the given uio,
* then reset it so that it can be reused. * then reset it so that it can be reused.
*/ */
static int static int
__sprint(fp, uio) __sprint(FILE *fp, register struct __suio *uio)
FILE *fp;
register struct __suio *uio;
{ {
register int err; register int err;
if (uio->uio_resid == 0) { if (uio->uio_resid == 0) {
uio->uio_iovcnt = 0; uio->uio_iovcnt = 0;
return (0); return 0;
} }
err = __sfvwrite(fp, uio); err = __sfvwrite(fp, uio);
uio->uio_resid = 0; uio->uio_resid = 0;
uio->uio_iovcnt = 0; uio->uio_iovcnt = 0;
return (err); return err;
} }
/* /*
* Helper function for `fprintf to unbuffered unix file': creates a * Helper function for `fprintf to unbuffered unix file': creates a
* temporary buffer. We only work on write-only files; this avoids * temporary buffer. We only work on write-only files; this avoids
* worries about ungetc buffers and so forth. * worries about ungetc buffers and so forth.
*/ */
static int static int
__sbprintf(fp, fmt, ap) __sbprintf(register FILE *fp, const char *fmt, va_list ap)
register FILE *fp;
const char *fmt;
va_list ap;
{ {
int ret; int ret;
FILE fake; FILE fake;
@ -155,11 +153,9 @@ static int exponent (char *, int, int);
#define SHORTINT 0x040 /* short integer */ #define SHORTINT 0x040 /* short integer */
#define ZEROPAD 0x080 /* zero (as opposed to blank) pad */ #define ZEROPAD 0x080 /* zero (as opposed to blank) pad */
#define FPT 0x100 /* Floating point number */ #define FPT 0x100 /* Floating point number */
int int
vfprintf(fp, fmt0, ap) vfprintf(FILE *fp, const char *fmt0, va_list ap)
FILE *fp;
const char *fmt0;
va_list ap;
{ {
register char *fmt; /* format string */ register char *fmt; /* format string */
register int ch; /* character from fmt */ register int ch; /* character from fmt */
@ -788,17 +784,16 @@ error:
#define TP_CHAR 15 #define TP_CHAR 15
#define TP_VOID 16 #define TP_VOID 16
/* /*
* Find all arguments when a positional parameter is encountered. Returns a * Find all arguments when a positional parameter is encountered. Returns a
* table, indexed by argument number, of pointers to each arguments. The * table, indexed by argument number, of pointers to each arguments. The
* initial argument table should be an array of STATIC_ARG_TBL_SIZE entries. * initial argument table should be an array of STATIC_ARG_TBL_SIZE entries.
* It will be replaces with a malloc-ed on if it overflows. * It will be replaces with a malloc-ed on if it overflows.
*/ */
static void static void
__find_arguments(fmt0, ap, argtable) __find_arguments(const char *fmt0, va_list ap, va_list **argtable)
const char *fmt0;
va_list ap;
va_list **argtable;
{ {
register char *fmt; /* format string */ register char *fmt; /* format string */
register int ch; /* character from fmt */ register int ch; /* character from fmt */
@ -900,16 +895,21 @@ reswitch: switch (ch) {
goto rflag; goto rflag;
} }
goto reswitch; goto reswitch;
#ifdef FLOATING_POINT
case 'L': case 'L':
flags |= LONGDBL; flags |= QUADINT
goto rflag; #ifdef FLOATING_POINT
LONGDBL
#endif #endif
;
goto rflag;
case 'h': case 'h':
flags |= SHORTINT; flags |= SHORTINT;
goto rflag; goto rflag;
case 'l': case 'l':
flags |= LONGINT; if (flags & LONGINT)
flags |= QUADINT;
else
flags |= LONGINT;
goto rflag; goto rflag;
case 'q': case 'q':
flags |= QUADINT; flags |= QUADINT;
@ -1061,13 +1061,13 @@ done:
free(typetable); free(typetable);
} }
/* /*
* Increase the size of the type table. * Increase the size of the type table.
*/ */
static int static int
__grow_type_table(typetable, tablesize) __grow_type_table(unsigned char **typetable, int *tablesize)
unsigned char **typetable;
int *tablesize;
{ {
unsigned char *oldtable = *typetable; unsigned char *oldtable = *typetable;
int newsize = *tablesize * 2; int newsize = *tablesize * 2;
@ -1094,10 +1094,7 @@ __grow_type_table(typetable, tablesize)
extern char *__dtoa __P((double, int, int, int *, int *, char **)); extern char *__dtoa __P((double, int, int, int *, int *, char **));
static char * static char *
cvt(value, ndigits, flags, sign, decpt, ch, length) cvt(double value, int ndigits, int flags, char *sign, int *decpt, int ch, int *length)
double value;
int ndigits, flags, *decpt, ch, *length;
char *sign;
{ {
int mode, dsgn; int mode, dsgn;
char *digits, *bp, *rve; char *digits, *bp, *rve;
@ -1137,10 +1134,9 @@ cvt(value, ndigits, flags, sign, decpt, ch, length)
return (digits); return (digits);
} }
static int static int
exponent(p0, exp, fmtch) exponent(char *p0, int exp, int fmtch)
char *p0;
int exp, fmtch;
{ {
register char *p, *t; register char *p, *t;
char expbuf[MAXEXP]; char expbuf[MAXEXP];