Mercurial > octave-nkf
changeset 4482:1fa73cab40a0
[project @ 2003-08-07 15:36:48 by jwe]
| author | jwe |
|---|---|
| date | Thu, 07 Aug 2003 15:36:49 +0000 |
| parents | cfbaee1f562f |
| children | ed49498a0a8f |
| files | src/ChangeLog src/utils.cc |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Aug 06 13:56:07 2003 +0000 +++ b/src/ChangeLog Thu Aug 07 15:36:49 2003 +0000 @@ -1,3 +1,9 @@ +2003-08-07 John W. Eaton <jwe@bevo.che.wisc.edu> + + * utils.cc (octave_vsnprintf): Call octave_raw_vsnprintf instead + of calling vsnprintf directly. + (octave_vsnprintf) [HAVE_C99_VSNPRINTF]: Declare nchars to be size_t. + 2003-08-06 Heine Kolltveit <kolltvei@idi.ntnu.no> * utils.cc (check_dimensions(Array<int>&, char),
--- a/src/utils.cc Wed Aug 06 13:56:07 2003 +0000 +++ b/src/utils.cc Thu Aug 07 15:36:49 2003 +0000 @@ -770,7 +770,6 @@ { bool neg = false; - int n = dim.length (); for (int i = 0; i < dim.length (); i++) { if (dim(i) < 0) @@ -960,7 +959,11 @@ static char *buf = 0; +#if defined (HAVE_C99_VSNPRINTF) + size_t nchars; +#else int nchars; +#endif if (! buf) buf = new char [size]; @@ -988,7 +991,7 @@ { BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE_FOR_VSNPRINTF; - vsnprintf (buf, size, fmt, args); + octave_raw_vsnprintf (buf, size, fmt, args); END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; }