Remove deprecated use of a label at the end of a function and just returnHAL_BEFORE_WIRELESS_REMOVE

    instead of goto'ing there.

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f351b64..dfc98830 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07  Joe Shaw  <joeshaw@novell.com>
+
+	* hald/hald_conf.c: Remove deprecated use of a label at the end of
+	a function and just return instead of goto'ing there.
+
 2004-06-07  David Zeuthen  <david@fubar.dk>
 
 	* configure.in: Bump to 0.2.92
diff --git a/hald/hald_conf.c b/hald/hald_conf.c
index b111705e..05531197 100644
--- a/hald/hald_conf.c
+++ b/hald/hald_conf.c
@@ -166,7 +166,7 @@ hald_read_conf_file (void)
 	file = fopen (HALD_CONF_FILE, "r");
 	if (file == NULL) {
 		HAL_INFO (("Couldn't open " HALD_CONF_FILE));
-		goto out;;
+		return;
 	}
 
 	fseek (file, 0L, SEEK_END);
@@ -214,5 +214,4 @@ out2:
 	free (filebuf);
 out1:
 	fclose (file);
-out:
 }