From 1f020b178664857b0e107778d04fb971a58e6230 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 23 Jul 2008 11:23:36 +0000 Subject: - trim any trailing whitespace --- libc/stdio/_fpmaxtostr.c | 8 ++++---- libc/stdio/_uintmaxtostr.c | 2 +- libc/stdio/_vfprintf.c | 26 +++++++++++++------------- libc/stdio/fdopen.c | 2 +- libc/stdio/fmemopen.c | 2 +- libc/stdio/fread.c | 2 +- libc/stdio/fseeko.c | 2 +- libc/stdio/old_vfprintf.c | 12 ++++++------ libc/stdio/open_memstream.c | 2 +- libc/stdio/remove.c | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) (limited to 'libc/stdio') diff --git a/libc/stdio/_fpmaxtostr.c b/libc/stdio/_fpmaxtostr.c index 2a63fda9d..b8d93a091 100644 --- a/libc/stdio/_fpmaxtostr.c +++ b/libc/stdio/_fpmaxtostr.c @@ -19,7 +19,7 @@ typedef size_t (__fp_outfunc_t)(FILE *fp, intptr_t type, intptr_t len, /* Copyright (C) 2000, 2001, 2003 Manuel Novoa III * - * Function: + * Function: * * ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, * __fp_outfunc_t fp_outfunc); @@ -185,7 +185,7 @@ static const __fpmax_t exp16_table[] = { #if FPMAX_MAX_EXP >= 16384 0x1.0p16384L #endif -#if FPMAX_MAX_EXP >= 32768 +#if FPMAX_MAX_EXP >= 32768 #error unsupported FPMAX_MAX_EXP. please increase table #endif }; @@ -410,7 +410,7 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, if (mode < 'a') { *exp_buf -= ('a' - 'A'); /* e->E and p->P */ mode += ('a' - 'A'); - } + } o_mode = mode; if ((mode == 'g') && (preci > 0)){ @@ -450,7 +450,7 @@ ssize_t _fpmaxtostr(FILE * fp, __fpmax_t x, struct printf_info *info, #ifdef __UCLIBC_HAS_HEXADECIMAL_FLOATS__ if ((mode|0x20) == 'a') { char *q; - + for (q = e ; *q ; --q) { if (*q > '9') { *q += (*exp_buf - ('p' - 'a') - '9' - 1); diff --git a/libc/stdio/_uintmaxtostr.c b/libc/stdio/_uintmaxtostr.c index 7a80371b8..0d25a0a9f 100644 --- a/libc/stdio/_uintmaxtostr.c +++ b/libc/stdio/_uintmaxtostr.c @@ -129,7 +129,7 @@ char attribute_hidden *_uintmaxtostr(register char * __restrict bufend, uintmax_ digit = low % base; low /= base; } - + #ifndef __LOCALE_C_ONLY if (unlikely(outdigit)) { bufend -= __UCLIBC_CURLOCALE_DATA.outdigit_length[digit]; diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index 947b5b077..2b642fc35 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -35,7 +35,7 @@ /* April 1, 2002 * Initialize thread locks for fake files in vsnprintf and vdprintf. * reported by Erik Andersen (andersen@codepoet.com) - * Fix an arg promotion handling bug in _do_one_spec for %c. + * Fix an arg promotion handling bug in _do_one_spec for %c. * reported by Ilguiz Latypov * * May 10, 2002 @@ -241,7 +241,7 @@ enum { FLAG_THOUSANDS = 0x20, FLAG_I18N = 0x40, /* only works for d, i, u */ FLAG_WIDESTREAM = 0x80 -}; +}; /**********************************************************************/ @@ -544,7 +544,7 @@ int attribute_hidden _ppfs_init(register ppfs_t *ppfs, const char *fmt0) #if 1 /* TODO - use memset here since already "paid for"? */ register int *p = ppfs->argtype; - + r = MAX_ARGS; do { *p++ = __PA_NOARG; @@ -637,7 +637,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) *(int *) #endif GET_VA_ARG(p,u,unsigned int,ppfs->arg); - } + } if (ppfs->info.prec == INT_MIN) { ppfs->info.prec = #ifdef __va_arg_ptr @@ -690,7 +690,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) case PA_STRING: case PA_WSTRING: GET_VA_ARG(p,p,void *,ppfs->arg); - break; + break; case __PA_NOARG: continue; } @@ -701,7 +701,7 @@ void attribute_hidden _ppfs_setargs(register ppfs_t *ppfs) if (ppfs->info.width == INT_MIN) { ppfs->info.width = (int) GET_ARG_VALUE(p + ppfs->argnumber[0] - 1,u,unsigned int); - } + } if (ppfs->info.prec == INT_MIN) { ppfs->info.prec = (int) GET_ARG_VALUE(p + ppfs->argnumber[1] - 1,u,unsigned int); @@ -750,7 +750,7 @@ libc_hidden_proto(__ctype_b) /* TODO -- rethink this -- perhaps we should set to largest type??? */ -#ifdef _OVERLAPPING_DIFFERENT_ARGS +#ifdef _OVERLAPPING_DIFFERENT_ARGS #define PROMOTED_SIZE_OF(X) ((sizeof(X) + sizeof(int) - 1) / sizeof(X)) @@ -974,7 +974,7 @@ int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs) restart_flags: /* Process flags. */ i = 1; p = spec_flags; - + do { if (*fmt == *p++) { ++fmt; @@ -1100,7 +1100,7 @@ int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs) /* Otherwise error. */ return -1; } - + #if defined(__UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__) || defined(__UCLIBC_HAS_PRINTF_M_SPEC__) DONE: #endif @@ -1260,7 +1260,7 @@ static size_t _outnstr(FILE *stream, const char *s, size_t wclen) mbstate.__mask = 0; todo = wclen; - + while (todo) { r = mbsrtowcs(wbuf, &s, ((todo <= sizeof(wbuf)/sizeof(wbuf[0])) @@ -1364,7 +1364,7 @@ static int _ppwfs_init(register ppfs_t *ppfs, const wchar_t *fmt0) #if 1 /* TODO - use memset here since already "paid for"? */ register int *p = ppfs->argtype; - + r = MAX_ARGS; do { *p++ = __PA_NOARG; @@ -1900,7 +1900,7 @@ int VFPRINTF_internal (FILE * __restrict stream, if (!*format) { /* we're done */ break; } - + if (format[1] != '%') { /* if we get here, *format == '%' */ /* TODO: _do_one_spec needs to know what the output funcs are!!! */ ppfs.fmtpos = (const char *)(++format); @@ -1960,7 +1960,7 @@ int VFPRINTF (FILE * __restrict stream, __STDIO_AUTO_THREADLOCK(stream); - if + if #ifdef L_vfprintf (!__STDIO_STREAM_IS_NARROW_WRITING(stream) && __STDIO_STREAM_TRANS_TO_WRITE(stream, __FLAG_NARROW)) diff --git a/libc/stdio/fdopen.c b/libc/stdio/fdopen.c index acf6231b2..635ab803d 100644 --- a/libc/stdio/fdopen.c +++ b/libc/stdio/fdopen.c @@ -15,7 +15,7 @@ FILE *fdopen(int filedes, const char *mode) intptr_t cur_mode; return (((cur_mode = fcntl(filedes, F_GETFL))) != -1) - ? _stdio_fopen(cur_mode, mode, NULL, filedes) + ? _stdio_fopen(cur_mode, mode, NULL, filedes) : NULL; } libc_hidden_def(fdopen) diff --git a/libc/stdio/fmemopen.c b/libc/stdio/fmemopen.c index eb4fa736e..ba194d726 100644 --- a/libc/stdio/fmemopen.c +++ b/libc/stdio/fmemopen.c @@ -142,7 +142,7 @@ FILE *fmemopen(void *s, size_t len, const char *modes) cookie->dynbuf = 1; *cookie->buf = 0; /* If we're appending, treat as empty file. */ } - + #ifndef __BCC__ fp = fopencookie(cookie, modes, _fmo_io_funcs); #else diff --git a/libc/stdio/fread.c b/libc/stdio/fread.c index d8b04f733..4f9c98465 100644 --- a/libc/stdio/fread.c +++ b/libc/stdio/fread.c @@ -56,7 +56,7 @@ size_t fread_unlocked(void * __restrict ptr, size_t size, size_t nmemb, goto DONE; } } - + /* We need to read from the host environment, so we must * flush all line buffered streams if the stream is not * fully buffered. */ diff --git a/libc/stdio/fseeko.c b/libc/stdio/fseeko.c index f63ebad4e..251040231 100644 --- a/libc/stdio/fseeko.c +++ b/libc/stdio/fseeko.c @@ -42,7 +42,7 @@ int FSEEK(register FILE *stream, OFFSET_TYPE offset, int whence) if ((!__STDIO_STREAM_IS_WRITING(stream) || !__STDIO_COMMIT_WRITE_BUFFER(stream)) - && ((whence != SEEK_CUR) + && ((whence != SEEK_CUR) || (__stdio_adjust_position(stream, &pos) >= 0)) && (__SEEK(stream, &pos, whence) >= 0) ) { diff --git a/libc/stdio/old_vfprintf.c b/libc/stdio/old_vfprintf.c index 85a0967c1..a7ec28d8d 100644 --- a/libc/stdio/old_vfprintf.c +++ b/libc/stdio/old_vfprintf.c @@ -1,7 +1,7 @@ /* * This file based on printf.c from 'Dlibs' on the atari ST (RdeBath) * - * + * * Dale Schumacher 399 Beacon Ave. * (alias: Dalnefre') St. Paul, MN 55104 * dal@syntel.UUCP United States of America @@ -72,7 +72,7 @@ * Fixed precision bug -- when negative set to default. * Added function fnprintf to support __dtostr. * Added floating point support for doubles. Yeah! - * + * * * May 2001 Fixes from Johan Adolfsson (johan.adolfsson@axis.com) * 1) printf("%c",0) returned 0 instead of 1. @@ -401,7 +401,7 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, p++; } } - + if (!flag[FLAG_PLUS]) { flag[FLAG_PLUS] = flag[FLAG_SPACE]; } @@ -584,14 +584,14 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, PRINT_INFO_SET_FLAG(&info,left); } #if 1 - cnt += _fpmaxtostr(op, + cnt += _fpmaxtostr(op, (__fpmax_t) ((dataargtype == (8 << 8)) ? va_arg(ap, long double) : (long double) va_arg(ap, double)), &info, _fp_out_narrow); #else - cnt += _fpmaxtostr(op, + cnt += _fpmaxtostr(op, (__fpmax_t) ((lval > 1) ? va_arg(ap, long double) @@ -658,7 +658,7 @@ int vfprintf(FILE * __restrict op, register const char * __restrict fmt, preci = 0; if (!flag[FLAG_MINUS_LJUSTIFY] /* && flag[FLAG_PLUS] */ - && (flag[FLAG_0_PAD] == '0')) { + && (flag[FLAG_0_PAD] == '0')) { preci = width; width = 0; } diff --git a/libc/stdio/open_memstream.c b/libc/stdio/open_memstream.c index a9327608a..e7b1cf435 100644 --- a/libc/stdio/open_memstream.c +++ b/libc/stdio/open_memstream.c @@ -144,7 +144,7 @@ FILE *open_memstream(char **__restrict bufloc, size_t *__restrict sizeloc) *cookie->buf = 0; /* Set nul terminator for buffer. */ *(cookie->bufloc = bufloc) = cookie->buf; *(cookie->sizeloc = sizeloc) = cookie->eof = cookie->pos = 0; - + #ifndef __BCC__ fp = fopencookie(cookie, "w", _oms_io_funcs); #else diff --git a/libc/stdio/remove.c b/libc/stdio/remove.c index 04ab12edb..f322411e4 100644 --- a/libc/stdio/remove.c +++ b/libc/stdio/remove.c @@ -16,7 +16,7 @@ libc_hidden_proto(unlink) /* SUSv3 states: * If path does not name a directory, remove(path) shall be equivalent * to unlink(path). If path names a directory, remove(path) shall be - * equivalent to rmdir(path). + * equivalent to rmdir(path). */ libc_hidden_proto(remove) -- cgit v1.2.3