Mercurial > hg > octave-lyh
changeset 9947:31436dcf7d0f
call nstrftime, not my_strftime
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 09 Dec 2009 02:20:30 -0500 |
| parents | 55061c7c8d6e |
| children | 6e17093431f5 |
| files | liboctave/ChangeLog liboctave/oct-time.cc src/ChangeLog src/load-save.cc |
| diffstat | 4 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,8 @@ +2009-12-09 John W. Eaton <jwe@octave.org> + + * oct-time.cc (octave_base_tm::strftime): Call nstrftime instead + of my_strftime. + 2009-12-09 John W. Eaton <jwe@octave.org> * oct-time.cc: Include strftime.h. Don't provide decl for strftime.
--- a/liboctave/oct-time.cc +++ b/liboctave/oct-time.cc @@ -267,7 +267,7 @@ buf = new char[bufsize]; buf[0] = '\0'; - chars_written = my_strftime (buf, bufsize, fmt_str, &t, 0, 0); + chars_written = nstrftime (buf, bufsize, fmt_str, &t, 0, 0); bufsize *= 2; }
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-12-09 John W. Eaton <jwe@octave.org> + + * load-save.cc: Call nstrftime instead of my_strftime. + 2009-12-09 John W. Eaton <jwe@octave.org> * load-save.cc: Include strftime.h.
--- a/src/load-save.cc +++ b/src/load-save.cc @@ -1184,8 +1184,8 @@ bdt = *gmtime (&now); memset (headertext, ' ', 124); // ISO 8601 format date - my_strftime (headertext, 124, "MATLAB 5.0 MAT-file, written by Octave " - OCTAVE_VERSION ", %Y-%m-%d %T UTC", &bdt, 1, 0); + nstrftime (headertext, 124, "MATLAB 5.0 MAT-file, written by Octave " + OCTAVE_VERSION ", %Y-%m-%d %T UTC", &bdt, 1, 0); // The first pair of bytes give the version of the MAT file // format. The second pair of bytes form a magic number which