From: Ken Steele <ken@tilera.com>
Date: Tue, 27 Aug 2013 21:16:59 +0000 (-0400)
Subject: Clean up SCLocalTime() usage
X-Git-Tag: suricata-2.0beta2~408
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d4dd18eb85841ba944957597ddf33ca268cd112d;p=thirdparty%2Fsuricata.git

Clean up SCLocalTime() usage

Remove cast of return type from SCLocalTime() as it is not needed.
Replace last use of localtime_r() with SCLocalTime().
---

diff --git a/src/counters.c b/src/counters.c
index a6d1b10072..d023594935 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -1049,7 +1049,7 @@ static int SCPerfOutputCounterFileIface()
 
     gettimeofday(&tval, NULL);
     struct tm local_tm;
-    tms = (struct tm *)SCLocalTime(tval.tv_sec, &local_tm);
+    tms = SCLocalTime(tval.tv_sec, &local_tm);
 
     /* Calculate the Engine uptime */
     int up_time = (int)difftime(tval.tv_sec, sc_start_time);
diff --git a/src/detect-engine-analyzer.c b/src/detect-engine-analyzer.c
index 2c0d2ddf88..052b5bab8e 100644
--- a/src/detect-engine-analyzer.c
+++ b/src/detect-engine-analyzer.c
@@ -210,7 +210,7 @@ int SetupFPAnalyzer(void)
     struct tm *tms;
     gettimeofday(&tval, NULL);
     struct tm local_tm;
-    tms = (struct tm *)SCLocalTime(tval.tv_sec, &local_tm);
+    tms = SCLocalTime(tval.tv_sec, &local_tm);
     fprintf(fp_engine_analysis_FD, "----------------------------------------------"
             "---------------------\n");
     fprintf(fp_engine_analysis_FD, "Date: %" PRId32 "/%" PRId32 "/%04d -- "
@@ -257,7 +257,7 @@ int SetupRuleAnalyzer(void)
             struct tm *tms;
             gettimeofday(&tval, NULL);
             struct tm local_tm;
-            tms = (struct tm *)localtime_r(&tval.tv_sec, &local_tm);
+            tms = SCLocalTime(tval.tv_sec, &local_tm);
             fprintf(rule_engine_analysis_FD, "----------------------------------------------"
                     "---------------------\n");
             fprintf(rule_engine_analysis_FD, "Date: %" PRId32 "/%" PRId32 "/%04d -- "
diff --git a/src/log-httplog.c b/src/log-httplog.c
index 57176a3426..7674089335 100644
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -156,7 +156,7 @@ static void LogHttpLogCustom(LogHttpLogThread *aft, htp_tx_t *tx, const struct t
 
     time_t time = ts->tv_sec;
     struct tm local_tm;
-    struct tm *timestamp = (struct tm *)SCLocalTime(time, &local_tm);
+    struct tm *timestamp = SCLocalTime(time, &local_tm);
 
     for (i = 0; i < httplog_ctx->cf_n; i++) {
         switch (httplog_ctx->cf_nodes[i]->type){
diff --git a/src/log-pcap.c b/src/log-pcap.c
index 431bd2c131..652379e04c 100644
--- a/src/log-pcap.c
+++ b/src/log-pcap.c
@@ -272,7 +272,7 @@ TmEcode PcapLog (ThreadVars *t, Packet *p, void *data, PacketQueue *pq,
 
     if (pl->mode == LOGMODE_SGUIL) {
         struct tm local_tm;
-        struct tm *tms = (struct tm *)SCLocalTime(p->ts.tv_sec, &local_tm);
+        struct tm *tms = SCLocalTime(p->ts.tv_sec, &local_tm);
         if (tms->tm_mday != pl->prev_day) {
             rotate = 1;
             pl->prev_day = tms->tm_mday;
@@ -342,7 +342,7 @@ TmEcode PcapLogDataInit(ThreadVars *t, void *initdata, void **data)
     memset(&ts, 0x00, sizeof(struct timeval));
     TimeGet(&ts);
     struct tm local_tm;
-    struct tm *tms = (struct tm *)SCLocalTime(ts.tv_sec, &local_tm);
+    struct tm *tms = SCLocalTime(ts.tv_sec, &local_tm);
     pl->prev_day = tms->tm_mday;
 
     *data = (void *)pl;
@@ -612,7 +612,7 @@ int PcapLogOpenFileCtx(PcapLogData *pl)
 
     if (pl->mode == LOGMODE_SGUIL) {
         struct tm local_tm;
-        struct tm *tms = (struct tm *)SCLocalTime(ts.tv_sec, &local_tm);
+        struct tm *tms = SCLocalTime(ts.tv_sec, &local_tm);
 
         char dirname[32], dirfull[PATH_MAX] = "";
 
diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c
index 97cda892b2..570805f22a 100644
--- a/src/util-profiling-rules.c
+++ b/src/util-profiling-rules.c
@@ -359,7 +359,7 @@ SCProfilingRuleDump(SCProfileDetectCtx *rules_ctx)
 
     gettimeofday(&tval, NULL);
     struct tm local_tm;
-    tms = (struct tm *)SCLocalTime(tval.tv_sec, &local_tm);
+    tms = SCLocalTime(tval.tv_sec, &local_tm);
 
     fprintf(fp, "  ----------------------------------------------"
             "----------------------------\n");