projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
printf-parse.c
diff --git
a/lib/printf-parse.c
b/lib/printf-parse.c
index
bd8caf9
..
f5cdb6e
100644
(file)
--- a/
lib/printf-parse.c
+++ b/
lib/printf-parse.c
@@
-1,5
+1,5
@@
/* Formatted output to strings.
/* Formatted output to strings.
- Copyright (C) 1999-2000, 2002-2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1999-2000, 2002-2003, 2006
-2007
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-68,7
+68,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
d->count = 0;
d_allocated = 1;
d->count = 0;
d_allocated = 1;
- d->dir = malloc (d_allocated * sizeof (DIRECTIVE));
+ d->dir =
(DIRECTIVE *)
malloc (d_allocated * sizeof (DIRECTIVE));
if (d->dir == NULL)
/* Out of memory. */
return -1;
if (d->dir == NULL)
/* Out of memory. */
return -1;
@@
-92,9
+92,9
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
if (size_overflow_p (memory_size)) \
/* Overflow, would lead to out of memory. */ \
goto error; \
if (size_overflow_p (memory_size)) \
/* Overflow, would lead to out of memory. */ \
goto error; \
- memory = (a
->arg
\
-
? realloc (a->arg, memory_size)
\
-
: malloc (memory_size));
\
+ memory = (a
rgument *) (a->arg
\
+
? realloc (a->arg, memory_size)
\
+
: malloc (memory_size));
\
if (memory == NULL) \
/* Out of memory. */ \
goto error; \
if (memory == NULL) \
/* Out of memory. */ \
goto error; \
@@
-326,7
+326,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
flags += 8;
cp++;
}
flags += 8;
cp++;
}
-#if
def
HAVE_INTMAX_T
+#if HAVE_INTMAX_T
else if (*cp == 'j')
{
if (sizeof (intmax_t) > sizeof (long))
else if (*cp == 'j')
{
if (sizeof (intmax_t) > sizeof (long))
@@
-382,7
+382,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
switch (c)
{
case 'd': case 'i':
switch (c)
{
case 'd': case 'i':
-#if
def
HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_LONGLONGINT;
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_LONGLONGINT;
@@
-400,7
+400,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_INT;
break;
case 'o': case 'u': case 'x': case 'X':
type = TYPE_INT;
break;
case 'o': case 'u': case 'x': case 'X':
-#if
def
HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_ULONGLONGINT;
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_ULONGLONGINT;
@@
-419,7
+419,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
break;
case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
case 'a': case 'A':
break;
case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
case 'a': case 'A':
-#if
def
HAVE_LONG_DOUBLE
+#if HAVE_LONG_DOUBLE
if (flags >= 16 || (flags & 4))
type = TYPE_LONGDOUBLE;
else
if (flags >= 16 || (flags & 4))
type = TYPE_LONGDOUBLE;
else
@@
-428,7
+428,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
break;
case 'c':
if (flags >= 8)
break;
case 'c':
if (flags >= 8)
-#if
def
HAVE_WINT_T
+#if HAVE_WINT_T
type = TYPE_WIDE_CHAR;
#else
goto error;
type = TYPE_WIDE_CHAR;
#else
goto error;
@@
-436,7
+436,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
else
type = TYPE_CHAR;
break;
else
type = TYPE_CHAR;
break;
-#if
def
HAVE_WINT_T
+#if HAVE_WINT_T
case 'C':
type = TYPE_WIDE_CHAR;
c = 'c';
case 'C':
type = TYPE_WIDE_CHAR;
c = 'c';
@@
-444,7
+444,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
#endif
case 's':
if (flags >= 8)
#endif
case 's':
if (flags >= 8)
-#if
def
HAVE_WCHAR_T
+#if HAVE_WCHAR_T
type = TYPE_WIDE_STRING;
#else
goto error;
type = TYPE_WIDE_STRING;
#else
goto error;
@@
-452,7
+452,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
else
type = TYPE_STRING;
break;
else
type = TYPE_STRING;
break;
-#if
def
HAVE_WCHAR_T
+#if HAVE_WCHAR_T
case 'S':
type = TYPE_WIDE_STRING;
c = 's';
case 'S':
type = TYPE_WIDE_STRING;
c = 's';
@@
-462,7
+462,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
type = TYPE_POINTER;
break;
case 'n':
type = TYPE_POINTER;
break;
case 'n':
-#if
def
HAVE_LONG_LONG_INT
+#if HAVE_LONG_LONG_INT
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_COUNT_LONGLONGINT_POINTER;
/* If 'long long' exists and is larger than 'long': */
if (flags >= 16 || (flags & 4))
type = TYPE_COUNT_LONGLONGINT_POINTER;
@@
-515,7
+515,7
@@
PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
if (size_overflow_p (memory_size))
/* Overflow, would lead to out of memory. */
goto error;
if (size_overflow_p (memory_size))
/* Overflow, would lead to out of memory. */
goto error;
- memory = realloc (d->dir, memory_size);
+ memory =
(DIRECTIVE *)
realloc (d->dir, memory_size);
if (memory == NULL)
/* Out of memory. */
goto error;
if (memory == NULL)
/* Out of memory. */
goto error;