[Ocfs2-tools-commits] manish commits r276 - trunk/ocfs2cdsl

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-09-28 22:47:21 -0500 (Tue, 28 Sep 2004)
New Revision: 276

Modified:
   trunk/ocfs2cdsl/Makefile
   trunk/ocfs2cdsl/ocfs2cdsl.c
Log:
Turn on optimization, fix some warnings


Modified: trunk/ocfs2cdsl/Makefile
===================================================================
--- trunk/ocfs2cdsl/Makefile	2004-09-29 03:16:43 UTC (rev 275)
+++ trunk/ocfs2cdsl/Makefile	2004-09-29 03:47:21 UTC (rev 276)
@@ -15,7 +15,7 @@
 DEFINES = -DG_DISABLE_DEPRECATED
 INCLUDES = $(GLIB_CFLAGS)
 
-OPTIMIZE = -g -O0
+OPTIMIZE = -g -O2
 
 CFLAGS += $(OPTIMIZE)
 

Modified: trunk/ocfs2cdsl/ocfs2cdsl.c
===================================================================
--- trunk/ocfs2cdsl/ocfs2cdsl.c	2004-09-29 03:16:43 UTC (rev 275)
+++ trunk/ocfs2cdsl/ocfs2cdsl.c	2004-09-29 03:47:21 UTC (rev 276)
@@ -310,6 +310,11 @@
 	if ((optind == argc) && !show_version)
 		usage(progname);
 
+	if (show_version) {
+		version(progname);
+		exit(0);
+	}
+
 	filename = argv[optind++];
 
 	tmp = g_path_get_dirname(filename);
@@ -326,11 +331,6 @@
 	if (optind < argc)
 		usage(progname);
 
-	if (show_version) {
-		version(progname);
-		exit(0);
-	}
-
 	s = g_new0(State, 1);
 
 	s->progname = progname;
@@ -437,6 +437,7 @@
 		break;
 	default:
 		g_assert_not_reached();
+		prefix = val = NULL;
 		break;
 	}
 
@@ -466,6 +467,7 @@
 		break;
 	default:
 		g_assert_not_reached();
+		type = NULL;
 		break;
 	}