Rename slap_tm to lutil_tm...

diff --git a/include/lutil.h b/include/lutil.h
index 462d5685560fdb0fba098909bc5b7957cf68806f..eae6df2433cc90ebefc7fd52903a623918b4c18b 100644 (file)
--- a/include/lutil.h
+++ b/include/lutil.h
@@ -147,7 +147,7 @@ lutil_progname LDAP_P((
        int argc,
        char *argv[] ));
 
-struct slap_tm {
+struct lutil_tm {
        int tm_sec;     /* seconds 0-60 (1 leap second) */
        int tm_min;     /* minutes 0-59 */
        int tm_hour;    /* hours 0-23 */
@@ -155,21 +155,21 @@ struct slap_tm {
        int tm_mon;     /* month 0-11 */
        int tm_year;    /* year - 1900 */
        int tm_usec;    /* microseconds */
-} slap_tm;
+} lutil_tm;
 
-struct slap_timet {
+struct lutil_timet {
        unsigned int tt_sec;    /* seconds since 1900 */
        int tt_gsec;            /* seconds since 1900, high 7 bits */
        unsigned int tt_usec;   /* microseconds */
-} slap_timet;
+} lutil_timet;
 
 LDAP_LUTIL_F( int )
 lutil_parsetime LDAP_P((
-       char *atm, struct slap_tm * ));
+       char *atm, struct lutil_tm * ));
 
 LDAP_LUTIL_F( int )
 lutil_tm2time LDAP_P((
-       struct slap_tm *, struct slap_timet * ));
+       struct lutil_tm *, struct lutil_timet * ));
 
 #ifdef _WIN32
 LDAP_LUTIL_F( void )

diff --git a/libraries/liblutil/utils.c b/libraries/liblutil/utils.c
index 2666f85214f9ac04771e21434c82376c08feefc9..16221d330c0bf2549d4ce4585a21a5f60b0112a2 100644 (file)
--- a/libraries/liblutil/utils.c
+++ b/libraries/liblutil/utils.c
@@ -136,7 +136,7 @@ size_t lutil_localtime( char *s, size_t smax, const struct tm *tm, long delta )
        return ret + 5;
 }
 
-int lutil_tm2time( struct slap_tm *tm, struct slap_timet *tt )
+int lutil_tm2time( struct lutil_tm *tm, struct lutil_timet *tt )
 {
        static int moffset[12] = {
                0, 31, 59, 90, 120,
@@ -196,7 +196,7 @@ int lutil_tm2time( struct slap_tm *tm, struct slap_timet *tt )
        return 0; 
 }
 
-int lutil_parsetime( char *atm, struct slap_tm *tm )
+int lutil_parsetime( char *atm, struct lutil_tm *tm )
 {
        while (atm && tm) {
                char *ptr = atm;