X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fdoprnt.c;h=d75f6fadcae1695a059f63443ac394d5131af76a;hb=4d34e361ac8a9436ce6dd850003416392d4cbdce;hp=b9951ae2948cffa4bab68cf3c83a1a6111b510f4;hpb=dbf2768f7b146e97e37a27316f70bb313f1acf15;p=chise%2Fxemacs-chise.git.1 diff --git a/src/doprnt.c b/src/doprnt.c index b9951ae..d75f6fa 100644 --- a/src/doprnt.c +++ b/src/doprnt.c @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ static const char * const valid_flags = "-+ #0"; static const char * const valid_converters = "dic" "ouxX" "feEgG" "sS"; static const char * const int_converters = "dic"; -static const char * const unsigned_int_converters = "ouxX"; +static const char * const unsigned_int_converters = "ouxXc"; static const char * const double_converters = "feEgG"; static const char * const string_converters = "sS"; @@ -222,7 +222,7 @@ parse_doprnt_spec (const Bufbyte *format, Bytecount format_length) case ' ': spec.space_flag = 1; break; case '#': spec.number_flag = 1; break; case '0': spec.zero_flag = 1; break; - default: abort (); + default: ABORT (); } NEXT_ASCII_BYTE (ch); } @@ -383,7 +383,7 @@ get_doprnt_args (printf_spec_dynarr *specs, va_list vargs) arg.d = va_arg (vargs, double); else if (strchr (string_converters, ch)) arg.bp = va_arg (vargs, Bufbyte *); - else abort (); + else ABORT (); Dynarr_add (args, arg); } @@ -569,7 +569,7 @@ emacs_doprnt_1 (Lisp_Object stream, const Bufbyte *format_nonreloc, obj = Ftruncate (obj); if (strchr (unsigned_int_converters, ch)) - arg.ul = (unsigned long) XINT (obj); + arg.ul = (unsigned long) XUINT (obj); else arg.l = XINT (obj); }