Changeset 11841 for trunk/ippTools/src/pxadminConfig.c

Timestamp:

Feb 15, 2007, 3:48:16 PM (19 years ago)

Author:

jhoblitt

Message:

remove the use of goto

File:

• trunk/ippTools/src/pxadminConfig.c (modified) (6 diffs)

trunk/ippTools/src/pxadminConfig.c

@@ -38 +38 @@
     if (!config->modules) {
         psError(PS_ERR_UNKNOWN, false, "Can't find site configuration");
-        goto FAIL;
+        psFree(config);
+        return NULL;
     }
 
@@ -80 +81 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        goto FAIL; 
+        psFree(config);
+        return NULL;
     }
 
@@ -86 +88 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        goto FAIL; 
+        psFree(config);
+        return NULL;
     }
 
@@ -95 +98 @@
         psArgumentHelp(arguments);
         psFree(arguments);
-        goto FAIL; 
+        psFree(config);
+        return NULL;
     }
 
@@ -104 +108 @@
     if (!config->dbh) {
         psError(PS_ERR_UNKNOWN, false, "Can't configure database");
-        goto FAIL; 
+        psFree(config);
+        return NULL;
     }
 
@@ -112 +117 @@
 
     return config;
-
-FAIL:
-    psFree(config);
-    return NULL;
 }
-
-/*
- * USAGE:
- * p2admin -create : create the P2 tables
- * p2admin -delete : delete the P2 tables (asks for confirmation)
- */