[Ocfs2-tools-commits] jlbec commits r864 - trunk/o2cb_ctl

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-04-28 20:30:14 -0500 (Thu, 28 Apr 2005)
New Revision: 864

Modified:
   trunk/o2cb_ctl/o2cb_config.c
   trunk/o2cb_ctl/o2cb_ctl.c
Log:

o NULL things so gcc shuts up.



Modified: trunk/o2cb_ctl/o2cb_config.c
===================================================================
--- trunk/o2cb_ctl/o2cb_config.c	2005-04-29 01:24:22 UTC (rev 863)
+++ trunk/o2cb_ctl/o2cb_config.c	2005-04-29 01:30:14 UTC (rev 864)
@@ -82,6 +82,8 @@
     gulong val;
     gint rc;
 
+    num_s = addr = port_s = NULL;
+
     rc = -EINVAL;
     name = j_config_get_attribute(cfs, "name");
     if (!name || !*name)
@@ -93,8 +95,6 @@
     if (!node)
         return -ENOMEM;
 
-    num_s = addr = port_s = NULL;
-
     rc = -EINVAL;
     num_s = j_config_get_attribute(cfs, "number");
     if (!num_s || !*num_s)

Modified: trunk/o2cb_ctl/o2cb_ctl.c
===================================================================
--- trunk/o2cb_ctl/o2cb_ctl.c	2005-04-29 01:24:22 UTC (rev 863)
+++ trunk/o2cb_ctl/o2cb_ctl.c	2005-04-29 01:30:14 UTC (rev 864)
@@ -688,6 +688,7 @@
         if (!iter)
             return -ENOMEM;
 
+        cluster = NULL; /* For gcc */
         node = NULL;
         while (j_iterator_has_more(iter))
         {