cleanup previous commit; update header

diff --git a/include/lutil.h b/include/lutil.h
index 4cba4df7e261e57ebeff3a5f1b0170da4ae81875..f0930e09c279aa624d3f196dd67d8a2455dbd9e1 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -149,8 +149,10 @@ struct tm;
 
 /* use this macro to statically allocate buffer for lutil_gentime */
 #define LDAP_LUTIL_GENTIME_BUFSIZE     22
+#define lutil_gentime(s,m,t)   lutil_localtime((s),(m),(t),0)
 LDAP_LUTIL_F( size_t )
-lutil_gentime LDAP_P(( char *s, size_t max, const struct tm *tm ));
+lutil_localtime LDAP_P(( char *s, size_t smax, const struct tm *tm,
+                       long delta ));
 
 #ifndef HAVE_MKSTEMP
 LDAP_LUTIL_F( int )

diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index d12bac851c7cd1c37cbe55b1887c57b804276419..ee0c25cd25cdc81f9acf8d9a6a3a46937e892c00 100644 (file)
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -46,9 +46,9 @@ char* lutil_progname( const char* name, int argc, char *argv[] )
        return progname;
 }
 
+#if 0
 size_t lutil_gentime( char *s, size_t smax, const struct tm *tm )
 {
-#if 0
        size_t ret;
 #ifdef HAVE_EBCDIC
 /* We've been compiling in ASCII so far, but we want EBCDIC now since
@@ -62,18 +62,16 @@ size_t lutil_gentime( char *s, size_t smax, const struct tm *tm )
        __etoa( s );
 #endif
        return ret;
-#else
-       return lutil_localtime( s, smax, tm, 0 );
-#endif
 }
+#endif
 
 size_t lutil_localtime( char *s, size_t smax, const struct tm *tm, long delta )
 {
        size_t  ret;
        char    *p;
 
-       if ( smax < 20 ) {
-               return -1;
+       if ( smax < 16 ) {      /* YYYYmmddHHMMSSZ */
+               return 0;
        }
 
 #ifdef HAVE_EBCDIC
@@ -83,12 +81,12 @@ size_t lutil_localtime( char *s, size_t smax, const struct tm *tm, long delta )
 #pragma convlit(suspend)
 #endif
        ret = strftime( s, smax, "%Y%m%d%H%M%SZ", tm );
-       if ( ret == 0 ) {
+       if ( delta == 0 || ret == 0 ) {
                return ret;
        }
 
-       if ( delta == 0 ) {
-               return ret;
+       if ( smax < 20 ) {      /* YYYYmmddHHMMSS+HHMM */
+               return 0;
        }
 
        p = s + 14;