From a9ec529ecee015e79dc60cb8ba8a6686cdf73a7b Mon Sep 17 00:00:00 2001 From: grumvalski Date: Tue, 22 Dec 2015 13:48:19 +0100 Subject: [PATCH] cnxcc: define inline functions in cnxcc.h --- modules/cnxcc/cnxcc.c | 24 ------------------------ modules/cnxcc/cnxcc.h | 27 ++++++++++++++++++++++++--- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/modules/cnxcc/cnxcc.c b/modules/cnxcc/cnxcc.c index e869af42048..3d21b3dd7b1 100644 --- a/modules/cnxcc/cnxcc.c +++ b/modules/cnxcc/cnxcc.c @@ -28,30 +28,6 @@ #include "cnxcc.h" -inline void get_datetime(str *dest) -{ - timestamp2isodt(dest, get_current_timestamp()); -} - -inline unsigned int get_current_timestamp() -{ - return time(NULL); -} - -inline int timestamp2isodt(str *dest, unsigned int timestamp) -{ - time_t tim; - struct tm *tmPtr; - - tim = timestamp; - tmPtr = localtime(&tim); - - strftime( dest->s, DATETIME_SIZE, "%Y-%m-%d %H:%M:%S", tmPtr); - dest->len = DATETIME_LENGTH; - - return 0; -} - double str2double(str *string) { char buffer[string->len + 1]; diff --git a/modules/cnxcc/cnxcc.h b/modules/cnxcc/cnxcc.h index 9454e1628fb..3973eabf0a4 100644 --- a/modules/cnxcc/cnxcc.h +++ b/modules/cnxcc/cnxcc.h @@ -31,9 +31,30 @@ #define DATETIME_LENGTH DATETIME_SIZE - 1 -inline void get_datetime(str *dest); -inline unsigned int get_current_timestamp(); -inline int timestamp2isodt(str *dest, unsigned int timestamp); +static inline unsigned int get_current_timestamp() +{ + return time(NULL); +} + +static inline int timestamp2isodt(str *dest, unsigned int timestamp) +{ + time_t tim; + struct tm *tmPtr; + + tim = timestamp; + tmPtr = localtime(&tim); + + strftime( dest->s, DATETIME_SIZE, "%Y-%m-%d %H:%M:%S", tmPtr); + dest->len = DATETIME_LENGTH; + + return 0; +} + +static inline void get_datetime(str *dest) +{ + timestamp2isodt(dest, get_current_timestamp()); +} + double str2double(str *string); #endif /* _CNXCC_H */