[sr-dev] git:master:fd8f7dd4: Merge pull request #453 from grumvalski/cnxcc_include

Module: kamailio Branch: master Commit: fd8f7dd442b7b197450c7bc338260f44b7dcc34d URL: https://github.com/kamailio/kamailio/commit/fd8f7dd442b7b197450c7bc338260f4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-12-22T15:47:09+01:00 Merge pull request #453 from grumvalski/cnxcc_include cnxcc: define inline functions in cnxcc.h --- Modified: modules/cnxcc/cnxcc.c Modified: modules/cnxcc/cnxcc.h --- Diff: https://github.com/kamailio/kamailio/commit/fd8f7dd442b7b197450c7bc338260f4… Patch: https://github.com/kamailio/kamailio/commit/fd8f7dd442b7b197450c7bc338260f4… --- diff --git a/modules/cnxcc/cnxcc.c b/modules/cnxcc/cnxcc.c index e869af4..3d21b3d 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 9454e16..3973eab 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 */