[PATCH 1/2] Kill active_facility_* variables.

[Vitezslav Samel]

They are written only and never read.

Signed-off-by: Vitezslav Samel <vitezslav(a)samel.cz&gt;
---
 src/hostmon.c   |    1 -
 src/ifstats.c   |    2 --
 src/instances.c |    2 --
 src/instances.h |    2 --
 src/iptraf.c    |    2 --
 src/itrafmon.c  |    1 -
 src/pktsize.c   |    1 -
 src/serv.c      |    1 -
 8 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/src/hostmon.c b/src/hostmon.c
index caf78cd..aafe34d 100644
--- a/src/hostmon.c
+++ b/src/hostmon.c
@@ -740,7 +740,6 @@ void hostmon(const struct OPTIONS *options, int facilitytime, char
*ifptr,
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
 	instance_id = adjust_instance_count(LANMONCOUNTFILE, 1);
-	strncpy(active_facility_countfile, LANMONCOUNTFILE, 64);
 
 	hostmonhelp();
 
diff --git a/src/ifstats.c b/src/ifstats.c
index b711abf..94dd432 100644
--- a/src/ifstats.c
+++ b/src/ifstats.c
@@ -448,7 +448,6 @@ void ifstats(const struct OPTIONS *options, struct filterstate
*ofilter,
 	}
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
-	active_facility_countfile[0] = '\0';
 
 	if (logging) {
 		if (strcmp(current_logfile, "") == 0) {
@@ -842,7 +841,6 @@ void detstats(char *iface, const struct OPTIONS *options, int
facilitytime,
 	}
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
-	active_facility_countfile[0] = '\0';
 
 	move(LINES - 1, 1);
 	stdexitkeyhelp();
diff --git a/src/instances.c b/src/instances.c
index 4d257db..265470f 100644
--- a/src/instances.c
+++ b/src/instances.c
@@ -46,7 +46,6 @@ void mark_facility(char *tagfile, char *facility, char *iface)
 		write_error(errstring, daemonized);
 	}
 	close(fd);
-	strncpy(active_facility_lockfile, lockfile, 64);
 }
 
 void unmark_facility(char *tagfile, char *iface)
@@ -55,7 +54,6 @@ void unmark_facility(char *tagfile, char *iface)
 
 	gen_lockfile_name(tagfile, iface, lockfile);
 	unlink(lockfile);
-	strcpy(active_facility_lockfile, "");
 }
 
 int facility_active(char *tagfile, char *iface)
diff --git a/src/instances.h b/src/instances.h
index a78eea0..e0e0626 100644
--- a/src/instances.h
+++ b/src/instances.h
@@ -6,8 +6,6 @@ instances.h - header file for instances.c
 
 #ifndef MAIN_MODULE
 extern int is_first_instance;
-extern char active_facility_lockfile[64];
-extern char active_facility_countfile[64];
 #endif
 
 void mark_facility(char *tagfile, char *facility, char *ifptr);
diff --git a/src/iptraf.c b/src/iptraf.c
index 29ba055..563d2b6 100644
--- a/src/iptraf.c
+++ b/src/iptraf.c
@@ -55,8 +55,6 @@ int exitloop = 0;
 int daemonized = 0;
 int facility_running = 0;
 int is_first_instance;
-char active_facility_lockfile[64];
-char active_facility_countfile[64];
 int accept_unsupported_interfaces = 0;
 char graphing_filter[80];
 
diff --git a/src/itrafmon.c b/src/itrafmon.c
index faf7d40..75925aa 100644
--- a/src/itrafmon.c
+++ b/src/itrafmon.c
@@ -689,7 +689,6 @@ void ipmon(struct OPTIONS *options, struct filterstate *ofilter,
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
 	instance_id = adjust_instance_count(ITRAFMONCOUNTFILE, 1);
-	strncpy(active_facility_countfile, ITRAFMONCOUNTFILE, 64);
 
 	init_tcp_table(&table);
 	init_othp_table(&othptbl, options->mac);
diff --git a/src/pktsize.c b/src/pktsize.c
index 00e8434..cccea2d 100644
--- a/src/pktsize.c
+++ b/src/pktsize.c
@@ -255,7 +255,6 @@ void packet_size_breakdown(struct OPTIONS *options, char *ifname,
 	}
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
-	active_facility_countfile[0] = '\0';
 
 	do {
 		gettimeofday(&tv, NULL);
diff --git a/src/serv.c b/src/serv.c
index 68243b3..ed49df1 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -771,7 +771,6 @@ void servmon(char *ifname, struct porttab *ports, const struct OPTIONS
*options,
 	}
 
 	adjust_instance_count(PROCCOUNTFILE, 1);
-	active_facility_countfile[0] = '\0';
 
 	initportlist(&list);
 	statwin = newwin(1, COLS, LINES - 2, 0);
-- 
1.7.8.4