Changeset 9255

Timestamp:

Oct 4, 2006, 1:43:34 PM (20 years ago)

Author:

jhoblitt

Message:

add pxAdminMode enum

Location:

trunk/ippTools/src

Files:

• pxadmin.c (modified) (3 diffs)
• pxadmin.h (modified) (1 diff)
• pxadminConfig.c (modified) (6 diffs)

trunk/ippTools/src/pxadmin.c

@@ -13 +13 @@
 
     switch (config->mode) {
-        case PX_MODE_RECREATE:
+        case PXADMIN_MODE_RECREATE:
             if (!pxDeleteTables(config)) {
                 psErrorStackPrint(stderr, "table deletion failed");
@@ -19 +19 @@
             }
             // fall through
-        case PX_MODE_CREATE:
+        case PXADMIN_MODE_CREATE:
             if (!pxCreateTables(config)) {
                 psErrorStackPrint(stderr, "table creation failed");
@@ -25 +25 @@
             }
             break;
-        case PX_MODE_DELETE:
+        case PXADMIN_MODE_DELETE:
             if (!pxDeleteTables(config)) {
                 psErrorStackPrint(stderr, "table deletion failed");

trunk/ippTools/src/pxadmin.h

@@ -4 +4 @@
 #include "pxtools.h"
 
+typedef enum {
+    PXADMIN_MODE_NONE      = 0x0,
+    PXADMIN_MODE_CREATE,
+    PXADMIN_MODE_DELETE,
+    PXADMIN_MODE_RECREATE
+} pxAdminMode;
+
 pxConfig *pxAdminConfig (pxConfig *config, int argc, char **argv);
 

trunk/ippTools/src/pxadminConfig.c

@@ -4 +4 @@
 
 #include <pmConfig.h>
+
 #include "pxtools.h"
+#include "pxadmin.h"
 
 pxConfig *pxAdminConfig(pxConfig *config, int argc, char **argv)
@@ -23 +25 @@
 
     int N;
-    config->mode = PX_MODE_NONE;
+    config->mode = PXADMIN_MODE_NONE;
     if ((N = psArgumentGet(argc, argv, "-create"))) {
         psArgumentRemove(N, &argc, argv);
@@ -29 +31 @@
             psAbort(argv[0], "only one mode selection is allowed");
         }
-        config->mode = PX_MODE_CREATE;
+        config->mode = PXADMIN_MODE_CREATE;
     }
     if ((N = psArgumentGet(argc, argv, "-delete"))) {
@@ -36 +38 @@
             psAbort(argv[0], "only one mode selection is allowed");
         }
-        config->mode = PX_MODE_DELETE;
+        config->mode = PXADMIN_MODE_DELETE;
     }
     if ((N = psArgumentGet(argc, argv, "-recreate"))) {
@@ -43 +45 @@
             psAbort(argv[0], "only one mode selection is allowed");
         }
-        config->mode = PX_MODE_RECREATE;
+        config->mode = PXADMIN_MODE_RECREATE;
     }
 
@@ -54 +56 @@
             "delete and recreate the P2 tables", "");
 
-    if (config->mode == PX_MODE_NONE) {
+    if (config->mode == PXADMIN_MODE_NONE) {
         fprintf (stderr, "admin mode not specified\n");
         psArgumentHelp(arguments);