Mercurial > hg > xemacs-beta
comparison src/doprnt.c @ 14:9ee227acff29 r19-15b90
Import from CVS: tag r19-15b90
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:48:42 +0200 |
parents | 376386a54a3c |
children | 0293115a14e9 |
comparison
equal
deleted
inserted
replaced
13:13c6d0aaafe5 | 14:9ee227acff29 |
---|---|
388 REGISTER int i; | 388 REGISTER int i; |
389 int init_byte_count = Lstream_byte_count (XLSTREAM (stream)); | 389 int init_byte_count = Lstream_byte_count (XLSTREAM (stream)); |
390 | 390 |
391 if (!NILP (format_reloc)) | 391 if (!NILP (format_reloc)) |
392 { | 392 { |
393 format_nonreloc = string_data (XSTRING (format_reloc)); | 393 format_nonreloc = XSTRING_DATA (format_reloc); |
394 format_length = string_length (XSTRING (format_reloc)); | 394 format_length = XSTRING_LENGTH (format_reloc); |
395 } | 395 } |
396 if (format_length < 0) | 396 if (format_length < 0) |
397 format_length = (Bytecount) strlen ((CONST char *) format_nonreloc); | 397 format_length = (Bytecount) strlen ((CONST char *) format_nonreloc); |
398 | 398 |
399 specs = parse_doprnt_spec (format_nonreloc, format_length); | 399 specs = parse_doprnt_spec (format_nonreloc, format_length); |
417 struct printf_spec *spec = Dynarr_atp (specs, i); | 417 struct printf_spec *spec = Dynarr_atp (specs, i); |
418 char ch; | 418 char ch; |
419 | 419 |
420 /* Copy the text before */ | 420 /* Copy the text before */ |
421 if (!NILP (format_reloc)) /* refetch in case of GC below */ | 421 if (!NILP (format_reloc)) /* refetch in case of GC below */ |
422 format_nonreloc = string_data (XSTRING (format_reloc)); | 422 format_nonreloc = XSTRING_DATA (format_reloc); |
423 doprnt_1 (stream, format_nonreloc + spec->text_before, | 423 doprnt_1 (stream, format_nonreloc + spec->text_before, |
424 spec->text_before_len, 0, -1, 0, 0); | 424 spec->text_before_len, 0, -1, 0, 0); |
425 | 425 |
426 ch = spec->converter; | 426 ch = spec->converter; |
427 | 427 |