summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-06-18 20:57:01 +0000
committerGerald Combs <gerald@wireshark.org>2005-06-18 20:57:01 +0000
commitc62e90650809299b5010367217fe25a4c502cb96 (patch)
treeaf4caab3301db933036bcd8c9215064cd6e934fa
parentf4e36cdc6c3138953b6c2592f53e6cde49cdcf70 (diff)
downloadwireshark-c62e90650809299b5010367217fe25a4c502cb96.tar.gz
Clear out any leftover preference information. Fix up whitespace.
svn path=/trunk/; revision=14693
-rw-r--r--epan/prefs.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/prefs.c b/epan/prefs.c
index 7193fd9ff0..a14b5c1dde 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1176,13 +1176,16 @@ read_prefs_file(const char *pf_path, FILE *pf, pref_set_pair_cb pref_set_pair_fc
gchar hint[] = "(saving your preferences once should remove this warning)";
if (! cur_val) {
- cur_val = g_string_new("");
+ cur_val = g_string_new("");
}
if (! cur_var) {
- cur_var = g_string_new("");
+ cur_var = g_string_new("");
}
-
+
+ g_string_truncate(cur_val, 0);
+ g_string_truncate(cur_var, 0);
+
while ((got_c = getc(pf)) != EOF) {
if (got_c == '\n') {
state = START;