From 235fad2e715b53ab650c75583dec33555e32d59b Mon Sep 17 00:00:00 2001
From: Peter Haag <peter@Pegasus.local>
Date: Sun, 3 Dec 2017 15:53:48 +0100
Subject: [PATCH] Fix minor issues and compiler warnings

---
 ChangeLog      |  1 +
 bin/flowtree.c |  7 ++-----
 bin/nfexpire.c |  4 ++--
 bin/nfstat.c   |  2 +-
 bin/sflow.c    | 20 +++++++++++---------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 36f2fb3..b8fd732 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2017-12-03
 - Fix old 1.6.15 tags
+- Fix minor issues and compiler warnings
 
 2017-10-22
 - Add support for CISCO IOS 8 bytes timestamps ID 21/22
diff --git a/bin/flowtree.c b/bin/flowtree.c
index fc8b5fe..c3728ba 100644
--- a/bin/flowtree.c
+++ b/bin/flowtree.c
@@ -467,9 +467,8 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
 	NodeList->last = node;
 	NodeList->length++;
 #ifdef DEVEL
-	int proto = node->proto;
 	printf("pushed node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", 
-		(unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+		(unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
 	ListCheck(NodeList);
 #endif
 	if ( NodeList->waiting ) {
@@ -483,7 +482,6 @@ void Push_Node(NodeList_t *NodeList, struct FlowNode *node) {
 
 struct FlowNode *Pop_Node(NodeList_t *NodeList, int *done) {
 struct FlowNode *node;
-int proto;
 
 	GetTreeLock(NodeList);
     while ( NodeList->length == 0 && !*done ) {
@@ -522,12 +520,11 @@ int proto;
 
 	node->left = NULL;
 	node->right = NULL;
-	proto = node->proto;
 
 	NodeList->length--;
 #ifdef DEVEL
 	printf("popped node 0x%llx proto: %u, length: %u first: %llx, last: %llx\n", 
-		(unsigned long long)node, proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
+		(unsigned long long)node, node->proto, NodeList->length, (unsigned long long)NodeList->list, (unsigned long long)NodeList->last);
 
 	ListCheck(NodeList);
 #endif
diff --git a/bin/nfexpire.c b/bin/nfexpire.c
index 7fe7e87..f108eec 100644
--- a/bin/nfexpire.c
+++ b/bin/nfexpire.c
@@ -212,12 +212,12 @@ int main( int argc, char **argv ) {
 struct stat fstat;
 int 		c, err, maxsize_set, maxlife_set;
 int			do_rescan, do_expire, do_list, print_stat, do_update_param, print_books, is_profile, nfsen_format;
-char		*maxsize_string, *lifetime_string, *datadir;
+char		*lifetime_string, *datadir;
 uint64_t	maxsize, lifetime, low_water;
 uint32_t	runtime;
 channel_t	*channel, *current_channel;
 
-	maxsize_string = lifetime_string = NULL;
+	lifetime_string = NULL;
 	datadir = NULL;
 	maxsize = lifetime = 0;
 	do_rescan  		= 0;
diff --git a/bin/nfstat.c b/bin/nfstat.c
index bcd4781..a4c00a3 100644
--- a/bin/nfstat.c
+++ b/bin/nfstat.c
@@ -1670,7 +1670,7 @@ uint32_t			maxindex, c;
 					else
 						printf("Top flows ordered by %s:\n", order_mode[order_index].string);
 				}
-				if ( !record_header ) 
+				if ( record_header ) 
 					printf("%s\n", record_header);
 			}
 			PrintSortedFlowcache(SortList, maxindex, topN, 0, print_record, tag, DESCENDING, extension_map_list);
diff --git a/bin/sflow.c b/bin/sflow.c
index 154d63a..961afb3 100644
--- a/bin/sflow.c
+++ b/bin/sflow.c
@@ -515,11 +515,17 @@ static inline void readCountersSample_v2v4(SFSample *sample, FlowSource_t *fs);
 
 static inline void StoreSflowRecord(SFSample *sample, FlowSource_t *fs);
 
+extern int verbose;
+
 #ifdef DEVEL
 static inline char *printTag(uint32_t tag, char *buf, int bufLen);
-#endif
 
-extern int verbose;
+static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
+    snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
+    return buf;
+} // End of printTag
+
+#endif
 
 
 /*_________________---------------------------__________________
@@ -1410,15 +1416,11 @@ static inline uint32_t getAddress(SFSample *sample, SFLAddress *address) {
 static inline void skipTLVRecord(SFSample *sample, uint32_t tag, uint32_t len, char *description) {
 
 #ifdef DEVEL
-static inline char *printTag(uint32_t tag, char *buf, int bufLen) {
-	snprintf(buf, bufLen, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
-	return buf;
-} // End of printTag
-
-char buf[51];
+	char buf[51];
+	snprintf(buf, 50, "%u:%u", (tag >> 12), (tag & 0x00000FFF));
+	printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, buf, len);
 #endif
 
-	dbg_printf("skipping unknown %s: 0x%x, %s len=%d\n", description, tag, printTag(tag, buf, 50), len);
 	skipBytes(sample, len);
 } // End of skipTLVRecord