libadmin: Don't double check for required param

[openafs.git] / src / libadmin / test / client.c

diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c
index 0ca179c..5eefe0a 100644 (file)
--- a/src/libadmin/test/client.c
+++ b/src/libadmin/test/client.c
@@ -33,7 +33,6 @@
 #include <ubik.h>
 #include <ubik_int.h>
 #ifdef AFS_NT40_ENV
-#include <winsock2.h>
 #include <pthread.h>
 #endif
 
@@ -265,9 +264,9 @@ DoClientLocalCellGet(struct cmd_syndesc *as, void *arock)
 int
 DoClientMountPointCreate(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { DIRECTORY, VOLUME, READWRITE,
+    enum { DIRECTORY, VOLUME, READWRITE,
        CHECK
-    } DoClientMountPointCreate_parm_t;
+    };
     afs_status_t st = 0;
     const char *directory = NULL;
     const char *volume = NULL;
@@ -319,7 +318,7 @@ Print_afs_serverEntry_p(afs_serverEntry_p serv, const char *prefix)
 int
 DoClientAFSServerGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER } DoClientAFSServerGet_parm_t;
+    enum { SERVER };
     afs_status_t st = 0;
     const char *server = NULL;
     afs_serverEntry_t entry;
@@ -464,9 +463,9 @@ GetStatTypeFromString(const char *type)
 int
 DoClientRPCStatsStateGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS,
+    enum { SERVER, PROCESS,
        STAT_TYPE
-    } DoClientRPCStatsStateGet_parm_t;
+    };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
@@ -475,29 +474,22 @@ DoClientRPCStatsStateGet(struct cmd_syndesc *as, void *arock)
     afs_stat_type_t which = 0;
     afs_RPCStatsState_t state;
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[STAT_TYPE].items) {
-       which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
-    }
+    which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -523,37 +515,30 @@ DoClientRPCStatsStateGet(struct cmd_syndesc *as, void *arock)
 int
 DoClientRPCStatsStateEnable(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS, STAT_TYPE } DoClientRPCStatsEnable_parm_t;
+    enum { SERVER, PROCESS, STAT_TYPE };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
     int srvrPort;
-    int typeIsValid = 0;
-    afs_stat_type_t which = 0;
+    int typeIsValid;
+    afs_stat_type_t which;
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[STAT_TYPE].items) {
-       which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
-    }
+    which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -576,39 +561,32 @@ DoClientRPCStatsStateEnable(struct cmd_syndesc *as, void *arock)
 int
 DoClientRPCStatsStateDisable(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS,
+    enum { SERVER, PROCESS,
        STAT_TYPE
-    } DoClientRPCStatsDisable_parm_t;
+    };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
     int srvrPort;
-    int typeIsValid = 0;
-    afs_stat_type_t which = 0;
+    int typeIsValid;
+    afs_stat_type_t which;
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[STAT_TYPE].items) {
-       which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
-    }
+    which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -642,15 +620,15 @@ Print_afs_RPCStats_p(afs_RPCStats_p stat, interface_function_list_p f_list,
               f_list->functionList[stat->s.stats_v1.func_index]);
     }
 
-    if (!hiszero(stat->s.stats_v1.invocations)) {
-       printf("%sinvoc (%u.%u) bytes_sent (%u.%u) bytes_rcvd (%u.%u)\n",
-              prefix, hgethi(stat->s.stats_v1.invocations),
-              hgetlo(stat->s.stats_v1.invocations),
-              hgethi(stat->s.stats_v1.bytes_sent),
-              hgetlo(stat->s.stats_v1.bytes_sent),
-              hgethi(stat->s.stats_v1.bytes_rcvd),
-              hgetlo(stat->s.stats_v1.bytes_rcvd)
-           );
+    if (stat->s.stats_v1.invocations != 0) {
+       printf("%sinvoc %"AFS_UINT64_FMT
+              " bytes_sent %"AFS_UINT64_FMT
+              " bytes_rcvd %"AFS_UINT64_FMT"\n",
+              prefix,
+              stat->s.stats_v1.invocations,
+              stat->s.stats_v1.bytes_sent,
+              stat->s.stats_v1.bytes_rcvd
+             );
        printf("\tqsum %d.%06d\tqsqr %d.%06d"
               "\tqmin %d.%06d\tqmax %d.%06d\n",
               stat->s.stats_v1.queue_time_sum.sec,
@@ -679,13 +657,13 @@ Print_afs_RPCStats_p(afs_RPCStats_p stat, interface_function_list_p f_list,
 int
 DoClientRPCStatsList(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS, STAT_TYPE } DoClientRPCStatsList_parm_t;
+    enum { SERVER, PROCESS, STAT_TYPE };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
     int srvrPort;
-    int typeIsValid = 0;
-    afs_stat_type_t which = 0;
+    int typeIsValid;
+    afs_stat_type_t which;
     afs_RPCStats_t stats;
     void *iter;
     int i = 0;
@@ -695,29 +673,22 @@ DoClientRPCStatsList(struct cmd_syndesc *as, void *arock)
      || pthread_once(&pthread_func_list_once, cr_list));
 #endif
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[STAT_TYPE].items) {
-       which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
-    }
+    which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -803,46 +774,39 @@ DoClientRPCStatsList(struct cmd_syndesc *as, void *arock)
 int
 DoClientRPCStatsClear(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS, STAT_TYPE, CLEAR_ALL, CLEAR_INVOCATIONS,
+    enum { SERVER, PROCESS, STAT_TYPE, CLEAR_ALL, CLEAR_INVOCATIONS,
        CLEAR_BYTES_SENT, CLEAR_BYTES_RCVD,
        CLEAR_QUEUE_TIME_SUM, CLEAR_QUEUE_TIME_SQUARE,
        CLEAR_QUEUE_TIME_MIN, CLEAR_QUEUE_TIME_MAX,
        CLEAR_EXEC_TIME_SUM, CLEAR_EXEC_TIME_SQUARE,
        CLEAR_EXEC_TIME_MIN, CLEAR_EXEC_TIME_MAX
-    } DoClientRPCStatsClear_parm_t;
+    };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
     int srvrPort;
-    int typeIsValid = 0;
-    afs_stat_type_t which = 0;
+    int typeIsValid;
+    afs_stat_type_t which;
     afs_RPCStatsClearFlag_t flag = 0;
     int seen_all = 0;
     int seen_any = 0;
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[STAT_TYPE].items) {
-       which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
-    }
+    which = GetStatTypeFromString(as->parms[STAT_TYPE].items->data);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -974,33 +938,28 @@ DoClientRPCStatsClear(struct cmd_syndesc *as, void *arock)
 int
 DoClientRPCStatsVersionGet(struct cmd_syndesc *as, void *arock)
 {
-    typedef enum { SERVER, PROCESS } DoClientRPCStatsVersionGet_parm_t;
+    enum { SERVER, PROCESS };
     afs_status_t st = 0;
     struct rx_connection *conn;
     afs_stat_source_t type;
     int srvrPort;
-    int typeIsValid = 0;
+    int typeIsValid;
     afs_RPCStatsVersion_t version;
 
-    if (as->parms[PROCESS].items) {
-       typeIsValid =
-           GetStatSourceFromString(as->parms[PROCESS].items->data, &type,
-                                   &srvrPort);
-    }
+    typeIsValid = GetStatSourceFromString(as->parms[PROCESS].items->data,
+                                         &type, &srvrPort);
 
-    if (as->parms[SERVER].items) {
-       if (typeIsValid) {
-           if (!afsclient_RPCStatOpen
-               (cellHandle, as->parms[SERVER].items->data, type, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpen", st);
-           }
-       } else {
-           if (!afsclient_RPCStatOpenPort
-               (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-                &st)) {
-               ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
-           }
+    if (typeIsValid) {
+       if (!afsclient_RPCStatOpen(cellHandle,
+                                  as->parms[SERVER].items->data,
+                                  type, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpen", st);
+       }
+    } else {
+       if (!afsclient_RPCStatOpenPort(cellHandle,
+                                      as->parms[SERVER].items->data,
+                                      srvrPort, &conn, &st)) {
+           ERR_ST_EXT("afsclient_RPCStatOpenPort", st);
        }
     }
 
@@ -1030,7 +989,7 @@ int
 DoClientCMGetServerPrefs(struct cmd_syndesc *as, void *arock)
 {
     afs_status_t st = 0;
-    typedef enum { SERVER, PORT } DoClientCMGetServerPrefs_parm_t;
+    enum { SERVER, PORT };
     struct rx_connection *conn;
     int srvrPort = AFSCONF_CALLBACKPORT;
     afs_CMServerPref_t prefs;
@@ -1047,12 +1006,10 @@ DoClientCMGetServerPrefs(struct cmd_syndesc *as, void *arock)
        }
     }
 
-    if (as->parms[SERVER].items) {
-       if (!afsclient_CMStatOpenPort
-           (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-            &st)) {
-           ERR_ST_EXT("afsclient_CMStatOpenPort", st);
-       }
+    if (!afsclient_CMStatOpenPort(cellHandle,
+                                 as->parms[SERVER].items->data,
+                                 srvrPort, &conn, &st)) {
+       ERR_ST_EXT("afsclient_CMStatOpenPort", st);
     }
 
     if (!util_CMGetServerPrefsBegin(conn, &iter, &st)) {
@@ -1099,7 +1056,7 @@ int
 DoClientCMListCells(struct cmd_syndesc *as, void *arock)
 {
     afs_status_t st = 0;
-    typedef enum { SERVER, PORT } DoClientCMListCells_parm_t;
+    enum { SERVER, PORT };
     struct rx_connection *conn;
     int srvrPort = AFSCONF_CALLBACKPORT;
     afs_CMListCell_t cellInfo;
@@ -1116,12 +1073,10 @@ DoClientCMListCells(struct cmd_syndesc *as, void *arock)
        }
     }
 
-    if (as->parms[SERVER].items) {
-       if (!afsclient_CMStatOpenPort
-           (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-            &st)) {
-           ERR_ST_EXT("afsclient_CMStatOpenPort", st);
-       }
+    if (!afsclient_CMStatOpenPort(cellHandle,
+                                 as->parms[SERVER].items->data,
+                                 srvrPort, &conn, &st)) {
+       ERR_ST_EXT("afsclient_CMStatOpenPort", st);
     }
 
     if (!util_CMListCellsBegin(conn, &iter, &st)) {
@@ -1153,7 +1108,7 @@ int
 DoClientCMLocalCell(struct cmd_syndesc *as, void *arock)
 {
     afs_status_t st = 0;
-    typedef enum { SERVER, PORT } DoClientCMLocalCell_parm_t;
+    enum { SERVER, PORT };
     struct rx_connection *conn;
     int srvrPort = AFSCONF_CALLBACKPORT;
     afs_CMCellName_t cellname;
@@ -1169,12 +1124,10 @@ DoClientCMLocalCell(struct cmd_syndesc *as, void *arock)
        }
     }
 
-    if (as->parms[SERVER].items) {
-       if (!afsclient_CMStatOpenPort
-           (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-            &st)) {
-           ERR_ST_EXT("afsclient_CMStatOpenPort", st);
-       }
+    if (!afsclient_CMStatOpenPort(cellHandle,
+                                 as->parms[SERVER].items->data,
+                                 srvrPort, &conn, &st)) {
+       ERR_ST_EXT("afsclient_CMStatOpenPort", st);
     }
 
     if (!util_CMLocalCell(conn, cellname, &st)) {
@@ -1211,7 +1164,7 @@ int
 DoClientCMClientConfig(struct cmd_syndesc *as, void *arock)
 {
     afs_status_t st = 0;
-    typedef enum { SERVER, PORT } DoClientCMLocalCell_parm_t;
+    enum { SERVER, PORT };
     struct rx_connection *conn;
     int srvrPort = AFSCONF_CALLBACKPORT;
     afs_ClientConfig_t config;
@@ -1227,12 +1180,10 @@ DoClientCMClientConfig(struct cmd_syndesc *as, void *arock)
        }
     }
 
-    if (as->parms[SERVER].items) {
-       if (!afsclient_CMStatOpenPort
-           (cellHandle, as->parms[SERVER].items->data, srvrPort, &conn,
-            &st)) {
-           ERR_ST_EXT("afsclient_CMStatOpenPort", st);
-       }
+    if (!afsclient_CMStatOpenPort(cellHandle,
+                                 as->parms[SERVER].items->data,
+                                 srvrPort, &conn, &st)) {
+       ERR_ST_EXT("afsclient_CMStatOpenPort", st);
     }
 
     if (!util_CMClientConfig(conn, &config, &st)) {