From ba355b6a7e941fe754aa70d7b8c8d5f107eb7927 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 12 Aug 2010 22:44:07 -0500
Subject: [PATCH] ifupdown: make testcase parsing quiet

Removes messages about invalid ENI formatting when running the
testcases.
---
 .../plugins/ifupdown/interface_parser.c       | 33 ++++++++++++-------
 .../plugins/ifupdown/interface_parser.h       |  2 +-
 system-settings/plugins/ifupdown/plugin.c     |  2 +-
 .../plugins/ifupdown/tests/test-ifupdown.c    |  2 +-
 4 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/system-settings/plugins/ifupdown/interface_parser.c b/system-settings/plugins/ifupdown/interface_parser.c
index bb00314be..4635db2ca 100644
--- a/system-settings/plugins/ifupdown/interface_parser.c
+++ b/system-settings/plugins/ifupdown/interface_parser.c
@@ -90,7 +90,7 @@ static char *join_values_with_spaces(char *dst, char **src)
 	return(dst);
 }
 
-void ifparser_init (const char *eni_file)
+void ifparser_init (const char *eni_file, int quiet)
 {
 	FILE *inp = fopen (eni_file, "r");
 	char line[255];
@@ -99,7 +99,8 @@ void ifparser_init (const char *eni_file)
 	int offs = 0;
 
 	if (inp == NULL) {
-		nm_warning ("Error: Can't open %s\n", eni_file);
+		if (!quiet)
+			g_warning ("Error: Can't open %s\n", eni_file);
 		return;
 	}
 
@@ -119,8 +120,10 @@ void ifparser_init (const char *eni_file)
 		len = strlen(line);
 		// skip over-long lines
 		if (!feof(inp) && len > 0 &&  line[len-1] != '\n') {
-			if (!skip_long_line)
-				g_message ("Error: Skipping over-long-line '%s...'\n", line);
+			if (!skip_long_line) {
+				if (!quiet)
+					g_message ("Error: Skipping over-long-line '%s...'\n", line);
+			}
 			skip_long_line = 1;
 			continue;
 		}
@@ -158,8 +161,10 @@ void ifparser_init (const char *eni_file)
 			continue;
 
 		if (toknum < 2) {
-			g_message ("Error: Can't parse interface line '%s'\n",
-					join_values_with_spaces(value, token));
+			if (!quiet) {
+				g_message ("Error: Can't parse interface line '%s'\n",
+						join_values_with_spaces(value, token));
+			}
 			skip_to_block = 1;
 			continue;
 		}
@@ -170,8 +175,10 @@ void ifparser_init (const char *eni_file)
 		// iface stanza takes at least 3 parameters
 		if (strcmp(token[0], "iface") == 0) {
 			if (toknum < 4) {
-				g_message ("Error: Can't parse iface line '%s'\n",
-						join_values_with_spaces(value, token));
+				if (!quiet) {
+					g_message ("Error: Can't parse iface line '%s'\n",
+							join_values_with_spaces(value, token));
+				}
 				continue;
 			}
 			add_block(token[0], token[1]);
@@ -199,10 +206,12 @@ void ifparser_init (const char *eni_file)
 			skip_to_block = 0;
 		}
 		else {
-			if (skip_to_block)
-				g_message ("Error: ignoring out-of-block data '%s'\n",
-						join_values_with_spaces(value, token));
-			else
+			if (skip_to_block) {
+				if (!quiet) {
+					g_message ("Error: ignoring out-of-block data '%s'\n",
+							join_values_with_spaces(value, token));
+				}
+			} else
 				add_data(token[0], join_values_with_spaces(value, token + 1));
 		}
 	}
diff --git a/system-settings/plugins/ifupdown/interface_parser.h b/system-settings/plugins/ifupdown/interface_parser.h
index 78799d88c..ea991c32d 100644
--- a/system-settings/plugins/ifupdown/interface_parser.h
+++ b/system-settings/plugins/ifupdown/interface_parser.h
@@ -41,7 +41,7 @@ typedef struct _if_block
 	struct _if_block *next;
 } if_block;
 
-void ifparser_init(const char *eni_file);
+void ifparser_init(const char *eni_file, int quiet);
 void ifparser_destroy(void);
 
 if_block *ifparser_getif(const char* iface);
diff --git a/system-settings/plugins/ifupdown/plugin.c b/system-settings/plugins/ifupdown/plugin.c
index 879cf9b0c..5ccdcc8d4 100644
--- a/system-settings/plugins/ifupdown/plugin.c
+++ b/system-settings/plugins/ifupdown/plugin.c
@@ -357,7 +357,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
 	update_system_hostname (inotify_helper, NULL, NULL, config);
 
 	/* Read in all the interfaces */
-	ifparser_init (ENI_INTERFACES_FILE);
+	ifparser_init (ENI_INTERFACES_FILE, 0);
 	block = ifparser_getfirst ();
 	while (block) {
 		if(!strcmp ("auto", block->type) || !strcmp ("allow-hotplug", block->type))
diff --git a/system-settings/plugins/ifupdown/tests/test-ifupdown.c b/system-settings/plugins/ifupdown/tests/test-ifupdown.c
index ad04a949f..164653645 100644
--- a/system-settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/system-settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -189,7 +189,7 @@ init_ifparser_with_file (const char *path, const char *file)
 	char *tmp;
 
 	tmp = g_strdup_printf ("%s/%s", path, file);
-	ifparser_init (tmp);
+	ifparser_init (tmp, 1);
 	g_free (tmp);
 }