Get rid of the argument to filter_expression_init().

It's always TRUE.

Clean up indentation while we're at it.

Change-Id: I11f5b849274b68bbda4fa32a8d909d6d5e71cbb1
Reviewed-on: https://code.wireshark.org/review/12732
Reviewed-by: Guy Harris <guy@alum.mit.edu>

3 files changed, 11 insertions, 12 deletions

diff --git a/epan/filter_expressions.c b/epan/filter_expressions.c
index 1b6d3069e6..56f38b9b71 100644
--- a/epan/filter_expressions.c
+++ b/epan/filter_expressions.c
@@ -44,7 +44,7 @@ filter_expression_new(const gchar *label, const gchar *expr,
 	struct filter_expression *expression;
 	struct filter_expression *prev;
 
-    expression = (struct filter_expression *)g_malloc0(sizeof(struct filter_expression));
+	expression = (struct filter_expression *)g_malloc0(sizeof(struct filter_expression));
 	expression->label = g_strdup(label);
 	expression->expression = g_strdup(expr);
 	expression->enabled = enabled;
@@ -64,20 +64,19 @@ filter_expression_new(const gchar *label, const gchar *expr,
 }
 
 void
-filter_expression_init(gboolean enable_prefs)
+filter_expression_init(void)
 {
-	if (enable_prefs)
-		prefs.filter_expressions = pfilter_expression_head;
+	prefs.filter_expressions = pfilter_expression_head;
 }
 
 void
 filter_expression_free(struct filter_expression *list_head)
 {
-    if (list_head == NULL)
-        return;
-    filter_expression_free(list_head->next);
-    g_free(list_head->label);
-    g_free(list_head->expression);
+	if (list_head == NULL)
+		return;
+	filter_expression_free(list_head->next);
+	g_free(list_head->label);
+	g_free(list_head->expression);
 }
 
 
diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h
index 20c0667270..fcca3d87d9 100644
--- a/epan/filter_expressions.h
+++ b/epan/filter_expressions.h
@@ -38,7 +38,7 @@ struct filter_expression {
 	gchar	*label;
 	gchar	*expression;
 
-    gint	 index;
+	gint	 index;
 	gboolean enabled;	/* Can be set to FALSE by Preferences Dialog */
 	gboolean deleted;	/* Can be set to TRUE by Preferences Dialog (GTK+ only) */
 
@@ -58,7 +58,7 @@ WS_DLL_PUBLIC
 struct filter_expression *filter_expression_new(const gchar *label,
     const gchar *expr, const gboolean enabled);
 
-void filter_expression_init(gboolean prefs);
+void filter_expression_init(void);
 
 /** Clear the filter expression list.
  * Frees each item in the list. Caller should set list_head to NULL afterward.
diff --git a/epan/prefs.c b/epan/prefs.c
index 758acdcb21..7aa333d533 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -2926,7 +2926,7 @@ init_prefs(void)
 
     prefs_register_modules();
 
-    filter_expression_init(TRUE);
+    filter_expression_init();
 
     prefs_initialized = TRUE;
 }