From 76c305c1282b481babb85815469be47652df855d Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 29 Oct 2013 08:29:11 +0100
Subject: [PATCH] Counters: fix unix socket

---
 src/counters.c     | 8 ++------
 src/counters.h     | 8 --------
 src/unix-manager.c | 2 +-
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/counters.c b/src/counters.c
index 5283ef7cee..3a63b561ae 100644
--- a/src/counters.c
+++ b/src/counters.c
@@ -724,9 +724,6 @@ TmEcode SCPerfOutputCounterSocket(json_t *cmd,
     uint64_t ui64_temp = 0;
     uint64_t ui64_result = 0;
 
-    double double_temp = 0;
-    double double_result = 0;
-
     uint32_t u = 0;
     int flag = 0;
 
@@ -769,7 +766,7 @@ TmEcode SCPerfOutputCounterSocket(json_t *cmd,
 
             SCMutexLock(&pctmi->head[u]->m);
 
-            while(pc_heads[u] != NULL && strcmp(pctmi->tm_name, pc_heads[u]->name->tm_name)) {
+            while(pc_heads[u] != NULL && strcmp(pctmi->tm_name, pc_heads[u]->tm_name)) {
                 pc_heads[u] = pc_heads[u]->next;
             }
         }
@@ -777,7 +774,6 @@ TmEcode SCPerfOutputCounterSocket(json_t *cmd,
         flag = 1;
         while(flag) {
             ui64_result = 0;
-            double_result = 0;
             if (pc_heads[0] == NULL)
                 break;
             pc = pc_heads[0];
@@ -793,7 +789,7 @@ TmEcode SCPerfOutputCounterSocket(json_t *cmd,
             }
 
             filled = 1;
-            json_object_set_new(jdata, pc->name->cname, json_integer(ui64_result));
+            json_object_set_new(jdata, pc->cname, json_integer(ui64_result));
         }
 
         for (u = 0; u < pctmi->size; u++)
diff --git a/src/counters.h b/src/counters.h
index 64efcb2a3c..a918ae4390 100644
--- a/src/counters.h
+++ b/src/counters.h
@@ -62,14 +62,6 @@ enum {
     SC_PERF_IFACE_MAX,
 };
 
-/**
- * \brief Name of the counter.  Basically like a primary key for a counter
- */
-typedef struct SCPerfCounterName_ {
-    char *cname;
-    char *tm_name;
-} SCPerfCounterName;
-
 /**
  * \brief Container to hold the counter variable
  */
diff --git a/src/unix-manager.c b/src/unix-manager.c
index b497d095d9..5fc0054bc6 100644
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -876,7 +876,7 @@ void *UnixManagerThread(void *td)
                 close(item->fd);
                 SCFree(item);
             }
-            SCPerfSyncCounters(th_v, 0);
+            SCPerfSyncCounters(th_v);
             break;
         }