diff options
| author | OBATA Akio <obache@wizdas.com> | 2019-04-09 18:49:43 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-04-11 17:48:29 +0200 |
| commit | 99d8c77851f1789e86e6f6ddbcc6695efc6ad250 (patch) | |
| tree | 624f77a89e898ab07938f97ce7a1cb0b2abe0d3e | |
| parent | b6ae5c8687b722b0d8e5febc373be97e7391d055 (diff) | |
| download | tdemultimedia-99d8c77851f1789e86e6f6ddbcc6695efc6ad250.tar.gz tdemultimedia-99d8c77851f1789e86e6f6ddbcc6695efc6ad250.zip | |
Fix for time_t != long
`time_t` may not be `long`, for examples, unsigned (long) int,
long long int (64bit integer type on 32bit arch), double, and so on.
Change to use difftime(3) to retrieve seconds.
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 9b8b7c129917f2813e5f412fe08b6a153ca05981)
| -rw-r--r-- | arts/runtime/artsbuilderloader_impl.cc | 2 | ||||
| -rw-r--r-- | kscd/libwm/database.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arts/runtime/artsbuilderloader_impl.cc b/arts/runtime/artsbuilderloader_impl.cc index ee009417..238daae2 100644 --- a/arts/runtime/artsbuilderloader_impl.cc +++ b/arts/runtime/artsbuilderloader_impl.cc @@ -247,7 +247,7 @@ public: if( stat(filename.c_str(), &st) == 0 ) { char mtime[32]; - sprintf(mtime,"[%ld]",st.st_mtime); + snprintf(mtime,sizeof(mtime),"[%.0f]",difftime(st.st_mtime, (time_t)0)); result += filename + mtime; } else diff --git a/kscd/libwm/database.c b/kscd/libwm/database.c index 62d66a32..d9b17d79 100644 --- a/kscd/libwm/database.c +++ b/kscd/libwm/database.c @@ -1107,11 +1107,11 @@ load( void ) /* This is some kind of profiling code. I don't change it to wm_lib_message() for now... */ #ifndef NDEBUG - long t1, t2; + time_t t1, t2; if( getenv( "WORKMAN_DEBUG" ) != NULL ) { time(&t1); - printf("%s (%d): search start = %ld\n", __FILE__, __LINE__, t1); + printf("%s (%d): search start = %.0f\n", __FILE__, __LINE__, difftime(t1, (time_t)0)); fflush(stdout); } #endif @@ -1158,7 +1158,7 @@ load( void ) if( getenv( "WORKMAN_DEBUG" ) != NULL ) { time(&t2); - printf("%s (%d): db search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1); + printf("%s (%d): db search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1)); fflush(stdout); } #endif @@ -1192,7 +1192,7 @@ load( void ) if( getenv( "WORKMAN_DEBUG" ) != NULL ) { time(&t2); - printf("%s (%d): search end = %ld, elapsed = %ld\n", __FILE__, __LINE__, t2, t2 - t1); + printf("%s (%d): search end = %.0f, elapsed = %.0f\n", __FILE__, __LINE__, difftime(t2, (time_t)0), difftime(t2, t1)); fflush(stdout); } #endif |