changeset 24103:c995cbb22422

rewrite strftime wrapper to match standard library definition * liboctave/wrappers/strftime-wrapper.c, liboctave/wrappers/strftime-wrapper.h (octave_strftime_wrapper): Rewrite definition to conform to standard strftime function definition, hardcoding unused extra arguments to gnulib nstrftime. * liboctave/system/oct-time.cc (octave::sys::base_tm::strftime): Drop unneeded extra arguments to octave_strftime_wrapper.
author Mike Miller <mtmiller@octave.org>
date Mon, 25 Sep 2017 19:23:52 -0700
parents c723faa56ab4
children 0d96215c6e7d
files liboctave/system/oct-time.cc liboctave/wrappers/strftime-wrapper.c liboctave/wrappers/strftime-wrapper.h
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/system/oct-time.cc	Sat Sep 23 18:11:20 2017 -0400
+++ b/liboctave/system/oct-time.cc	Mon Sep 25 19:23:52 2017 -0700
@@ -198,7 +198,7 @@
               buf[0] = '\0';
 
               chars_written
-                = octave_strftime_wrapper (buf, bufsize, fmt_str, &t, nullptr, 0);
+                = octave_strftime_wrapper (buf, bufsize, fmt_str, &t);
 
               bufsize *= 2;
             }
--- a/liboctave/wrappers/strftime-wrapper.c	Sat Sep 23 18:11:20 2017 -0400
+++ b/liboctave/wrappers/strftime-wrapper.c	Mon Sep 25 19:23:52 2017 -0700
@@ -36,7 +36,7 @@
 
 size_t
 octave_strftime_wrapper (char *buf, size_t len, const char *fmt,
-                         const struct tm *t, struct tm_zone *tz, int ns)
+                         const struct tm *t)
 {
-  return nstrftime (buf, len, fmt, t, tz, ns);
+  return nstrftime (buf, len, fmt, t, NULL, 0);
 }
--- a/liboctave/wrappers/strftime-wrapper.h	Sat Sep 23 18:11:20 2017 -0400
+++ b/liboctave/wrappers/strftime-wrapper.h	Mon Sep 25 19:23:52 2017 -0700
@@ -35,7 +35,7 @@
 
 extern size_t
 octave_strftime_wrapper (char *buf, size_t len, const char *fmt,
-                         const struct tm *t, struct tm_zone *tz, int ns);
+                         const struct tm *t);
 
 #if defined __cplusplus
 }