[netfilter-cvslog] r7382 - in trunk/conntrack-tools: . src

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-02-22 13:17:09 +0100 (Fri, 22 Feb 2008)
New Revision: 7382

Modified:
   trunk/conntrack-tools/ChangeLog
   trunk/conntrack-tools/src/main.c
Log:
cleanup: remove config_set from main(), use config_file variable instead


Modified: trunk/conntrack-tools/ChangeLog
===================================================================
--- trunk/conntrack-tools/ChangeLog	2008-02-22 00:29:23 UTC (rev 7381)
+++ trunk/conntrack-tools/ChangeLog	2008-02-22 12:17:09 UTC (rev 7382)
@@ -48,6 +48,7 @@
 o add support for NAT sequence adjustment (requires Linux kernel >= 2.6.25)
 o remove TODO file from release tarballs
 o compose the file descriptor set at initialization stage to save some cycles
+o cleanup: remove config_set from main(), use config_file variable instead
 
 Max Kellermann <max at duempel.org>:
 

Modified: trunk/conntrack-tools/src/main.c
===================================================================
--- trunk/conntrack-tools/src/main.c	2008-02-22 00:29:23 UTC (rev 7381)
+++ trunk/conntrack-tools/src/main.c	2008-02-22 12:17:09 UTC (rev 7382)
@@ -77,8 +77,8 @@
 
 int main(int argc, char *argv[])
 {
-	int ret, i, config_set = 0, action = -1;
-	char config_file[PATH_MAX];
+	int ret, i, action = -1;
+	char config_file[PATH_MAX] = {};
 	int type = 0;
 	struct utsname u;
 	int version, major, minor;
@@ -126,7 +126,6 @@
 							"down to %d characters",
 							PATH_MAX);
 				}
-				config_set = 1;
 				break;
 			}
 			show_usage(argv[0]);
@@ -184,7 +183,7 @@
 		}
 	}
 
-	if (config_set == 0)
+	if (!config_file[0])
 		strcpy(config_file, DEFAULT_CONFIGFILE);
 
 	umask(0177);