HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More signal-handler cleanup.
[bpt/emacs.git]
/
src
/
doprnt.c
diff --git
a/src/doprnt.c
b/src/doprnt.c
index
b106ffb
..
b36e946
100644
(file)
--- a/
src/doprnt.c
+++ b/
src/doprnt.c
@@
-102,7
+102,6
@@
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <stdio.h>
#include <config.h>
#include <stdio.h>
-#include <ctype.h>
#include <setjmp.h>
#include <float.h>
#include <unistd.h>
#include <setjmp.h>
#include <float.h>
#include <unistd.h>
@@
-135,8
+134,8
@@
ptrdiff_t
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
const char *format_end, va_list ap)
{
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
const char *format_end, va_list ap)
{
- const char *fmt = format; /* Pointer into format string */
-
register char *bufptr = buffer; /* Pointer into output buffer..
*/
+ const char *fmt = format; /* Pointer into format string
.
*/
+
char *bufptr = buffer; /* Pointer into output buffer.
*/
/* Use this for sprintf unless we need something really big. */
char tembuf[DBL_MAX_10_EXP + 100];
/* Use this for sprintf unless we need something really big. */
char tembuf[DBL_MAX_10_EXP + 100];
@@
-150,7
+149,7
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
/* Buffer we have got with malloc. */
char *big_buffer = NULL;
/* Buffer we have got with malloc. */
char *big_buffer = NULL;
-
register size_t tem
;
+
ptrdiff_t tem = -1
;
char *string;
char fixed_buffer[20]; /* Default buffer for small formatting. */
char *fmtcpy;
char *string;
char fixed_buffer[20]; /* Default buffer for small formatting. */
char *fmtcpy;
@@
-161,10
+160,9
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
if (format_end == 0)
format_end = format + strlen (format);
if (format_end == 0)
format_end = format + strlen (format);
- if (format_end - format < sizeof (fixed_buffer) - 1)
- fmtcpy = fixed_buffer;
- else
- SAFE_ALLOCA (fmtcpy, char *, format_end - format + 1);
+ fmtcpy = (format_end - format < sizeof (fixed_buffer) - 1
+ ? fixed_buffer
+ : SAFE_ALLOCA (format_end - format + 1));
bufsize--;
bufsize--;
@@
-257,7
+255,7
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
{
if (big_buffer)
xfree (big_buffer);
{
if (big_buffer)
xfree (big_buffer);
- big_buffer =
(char *)
xmalloc (size_bound);
+ big_buffer = xmalloc (size_bound);
sprintf_buffer = big_buffer;
size_allocated = size_bound;
}
sprintf_buffer = big_buffer;
size_allocated = size_bound;
}
@@
-275,32
+273,32
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
case no_modifier:
{
int v = va_arg (ap, int);
case no_modifier:
{
int v = va_arg (ap, int);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case long_modifier:
{
long v = va_arg (ap, long);
}
break;
case long_modifier:
{
long v = va_arg (ap, long);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case pD_modifier:
signed_pD_modifier:
{
ptrdiff_t v = va_arg (ap, ptrdiff_t);
}
break;
case pD_modifier:
signed_pD_modifier:
{
ptrdiff_t v = va_arg (ap, ptrdiff_t);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case pI_modifier:
{
EMACS_INT v = va_arg (ap, EMACS_INT);
}
break;
case pI_modifier:
{
EMACS_INT v = va_arg (ap, EMACS_INT);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case pM_modifier:
{
intmax_t v = va_arg (ap, intmax_t);
}
break;
case pM_modifier:
{
intmax_t v = va_arg (ap, intmax_t);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
}
}
break;
}
@@
-315,13
+313,13
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
case no_modifier:
{
unsigned v = va_arg (ap, unsigned);
case no_modifier:
{
unsigned v = va_arg (ap, unsigned);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case long_modifier:
{
unsigned long v = va_arg (ap, unsigned long);
}
break;
case long_modifier:
{
unsigned long v = va_arg (ap, unsigned long);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case pD_modifier:
}
break;
case pD_modifier:
@@
-329,13
+327,13
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
case pI_modifier:
{
EMACS_UINT v = va_arg (ap, EMACS_UINT);
case pI_modifier:
{
EMACS_UINT v = va_arg (ap, EMACS_UINT);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
case pM_modifier:
{
uintmax_t v = va_arg (ap, uintmax_t);
}
break;
case pM_modifier:
{
uintmax_t v = va_arg (ap, uintmax_t);
- sprintf (sprintf_buffer, fmtcpy, v);
+
tem =
sprintf (sprintf_buffer, fmtcpy, v);
}
break;
}
}
break;
}
@@
-348,7
+346,7
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
case 'g':
{
double d = va_arg (ap, double);
case 'g':
{
double d = va_arg (ap, double);
- sprintf (sprintf_buffer, fmtcpy, d);
+
tem =
sprintf (sprintf_buffer, fmtcpy, d);
/* Now copy into final output, truncating as necessary. */
string = sprintf_buffer;
goto doit;
/* Now copy into final output, truncating as necessary. */
string = sprintf_buffer;
goto doit;
@@
-368,8
+366,8
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
/* Copy string into final output, truncating if no room. */
doit:
/* Copy string into final output, truncating if no room. */
doit:
+ eassert (0 <= tem);
/* Coming here means STRING contains ASCII only. */
/* Coming here means STRING contains ASCII only. */
- tem = strlen (string);
if (STRING_BYTES_BOUND < tem)
error ("Format width or precision too large");
width = tem;
if (STRING_BYTES_BOUND < tem)
error ("Format width or precision too large");
width = tem;
@@
-413,8
+411,7
@@
doprnt (char *buffer, ptrdiff_t bufsize, const char *format,
bufsize = 0;
continue;
}
bufsize = 0;
continue;
}
- else
- memcpy (bufptr, string, tem);
+ memcpy (bufptr, string, tem);
bufptr += tem;
bufsize -= tem;
if (minlen < 0)
bufptr += tem;
bufsize -= tem;
if (minlen < 0)