aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-04-02 01:12:52 +0100
committerJonathan McCrohan <jmccrohan@gmail.com>2012-04-02 01:12:52 +0100
commitdd425c8ef8952d3a8553029dbbc7d89abd0908df (patch)
tree00be553a6ae8b5228ce8b84d6c56dfab40baba41
parent2a2b4e8e041c8f795f519b93f6b4a0a2b87a7359 (diff)
downloadverteco-dd425c8ef8952d3a8553029dbbc7d89abd0908df.tar.gz
modbuslog: use time.h functions to manipulate datev1.5
Fixes issue that became apparent after switch to DST
-rw-r--r--src/modbuslog.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/modbuslog.c b/src/modbuslog.c
index 43d102d..d967e4a 100644
--- a/src/modbuslog.c
+++ b/src/modbuslog.c
@@ -156,7 +156,9 @@ int main(int argc, char *argv[]) {
select(0, NULL, NULL, NULL, NULL);
time_t t = time(NULL);
- time_t unixtime_min = (((int) t) / 60 * 60);
+ struct tm unixtime_min_time_t = *gmtime (&t);
+ unixtime_min_time_t.tm_sec = 0;
+ time_t unixtime_min = mktime(&unixtime_min_time_t);
//int unixtime = (int) t;
//printf("%d\n", unixtime);
@@ -281,9 +283,12 @@ int main(int argc, char *argv[]) {
//MODBUS_SET_INT16_TO_INT8(tab_int8, index, value);
// round forward to next midnight
- time_t unixtime_day = ((((int) t) / 86400 * 86400) + 86400);
-
- struct tm midnight = *localtime(&unixtime_day);
+ struct tm midnight = *localtime(&t);
+ midnight.tm_hour = 0;
+ midnight.tm_min = 0;
+ midnight.tm_sec = 0;
+ midnight.tm_mday += 1;
+ mktime (&midnight);
char log_filename[50];
ss='nohover-highlight'> added statfs plugin 2005-04-02[lcd4linux @ 2005-04-02 05:28:58 by reinelt]reinelt3-19/+27 fixed gcc4 warnings about signed/unsigned mismatches 2005-04-01[lcd4linux @ 2005-04-01 05:16:04 by reinelt]reinelt5-584/+694 moved plugin init stuff to a seperate function called on first use 2005-03-30[lcd4linux @ 2005-03-30 04:57:50 by reinelt]reinelt3-23/+67 Evaluator speedup: use bsearch for finding functions and variables 2005-03-28[lcd4linux @ 2005-03-28 22:29:23 by reinelt]reinelt1-250/+346 HD44780 multiple displays patch from geronet 2005-03-28[lcd4linux @ 2005-03-28 19:39:14 by reinelt]reinelt9-256/+1147 HD44780/I2C patch from Luis merged (still does not work for me) 2005-03-25[lcd4linux @ 2005-03-25 15:44:43 by reinelt]reinelt1-2/+5 HD44780 Backlight fixed (thanks to geronet) 2005-03-23[lcd4linux @ 2005-03-23 12:23:35 by reinelt]reinelt1-27/+32 fixed some signed/unsigned char mismatches in the Crystalfontz driver (ticket #12) 2005-02-24[lcd4linux @ 2005-02-24 07:07:55 by reinelt]reinelt1-0/+53 ChangeLog 2005-02-24[lcd4linux @ 2005-02-24 07:06:45 by reinelt]reinelt11-28/+347 SimpleLCD driver added 2005-02-24[lcd4linux @ 2005-02-24 06:51:40 by reinelt]reinelt1-4/+5 LCD-Linux driver GOTO_COST corrected 2005-01-30[lcd4linux @ 2005-01-30 06:43:22 by reinelt]reinelt4-69/+95 driver for LCD-Linux finished 2005-01-29[lcd4linux @ 2005-01-29 09:30:56 by reinelt]reinelt1-8/+11 minor HD44780 cleanups 2005-01-22[lcd4linux @ 2005-01-22 22:57:57 by reinelt]reinelt9-47/+382 LCD-Linux driver added 2005-01-22[lcd4linux @ 2005-01-22 12:44:41 by reinelt]reinelt1-3/+6 MatrixOrbital backlight micro-fix 2005-01-18[lcd4linux @ 2005-01-18 06:30:21 by reinelt]reinelt89-261/+603 added (C) to all copyright statements 2005-01-17[lcd4linux @ 2005-01-17 06:38:48 by reinelt]reinelt1-1/+6 info about backlight and brightness 2005-01-17[lcd4linux @ 2005-01-17 06:29:24 by reinelt]reinelt3-33/+85 added software-controlled backlight support to HD44780