Factorize string related functions

[ngadmin] / cli / src / common.c

diff --git a/cli/src/common.c b/cli/src/common.c
index 7d35301eff059d4445435e0b540643126d877ac5..28a50d0b761d12dbd9f0de1a974a5e9a3143fbb2 100644 (file)
--- a/cli/src/common.c
+++ b/cli/src/common.c
@@ -4,100 +4,14 @@
 
 void printErrCode (int err)
 {
-       switch (err) {
-       case ERR_OK:
-               break;
+       const char *str;
        
-       case ERR_NET:
-               printf("network error\n");
-               break;
+       str = ngadmin_errorStr(err);
        
-       case ERR_NOTLOG:
-               printf("no switch selected\n");
-               break;
-       
-       case ERR_DENIED:
-               printf("access denied\n");
-               break;
-       
-       case ERR_BADPASS:
-               printf("wrong password\n");
-               break;
-       
-       case ERR_BADID:
-               printf("bad switch id\n");
-               break;
-       
-       case ERR_INVARG:
-               printf("invalid argument\n");
-               break;
-       
-       case ERR_TIMEOUT:
-               printf("timeout\n");
-               break;
-       
-       case ERR_NOTIMPL:
-               printf("not implemented\n");
-               break;
-       
-       case ERR_BADREPLY:
-               printf("bad reply from switch\n");
-               break;
-       
-       case ERR_UNKNOWN:
-               printf("unknown error\n");
-               break;
-       
-       default:
+       if (str == NULL)
                printf("unknown status code (%i)\n", err);
-       }
-}
-
-
-const char* const bitrates[] = {
-       "nl",
-       "512K",
-       "1M",
-       "2M",
-       "4M",
-       "8M",
-       "16M",
-       "32M",
-       "64M",
-       "128M",
-       "256M",
-       "512M",
-       NULL
-};
-
-
-const char* const prio[]={
-       NULL,
-       "high",
-       "medium",
-       "normal",
-       "low",
-       NULL
-};
-
-
-int parseBitrate (const char *s)
-{
-       int i;
-       
-       for (i = 0; bitrates[i] != NULL && strcasecmp(bitrates[i], s) != 0; i++);
-       
-       return i;
-}
-
-
-char parsePrio (const char *s)
-{
-       int i;
-       
-       for (i = 1; prio[i] != NULL && strcasecmp(prio[i], s) != 0; i++);
-       
-       return (char)i;
+       else if (err != ERR_OK)
+               puts(str);
 }
 
 
@@ -110,31 +24,15 @@ void displaySwitchTab (const struct swi_attr *sa, int nb)
                return;
        }
        
-       printf("Num\tMac\t\t\tProduct\t\tName\t\t\tIP/mask\t\t\tDHCP\tPorts\tFirmware\n");
+       printf("Num\tMac\t\t\tProduct\t\t\tName\t\t\t\t\tIP\t\tPorts\tFirmware\n");
        
-       for (i = 0; i < nb; i++) {
-               printf("%i\t%s\t%s\t%s\t\t%s/", i, ether_ntoa(&sa[i].mac), sa[i].product, sa[i].name, inet_ntoa(sa[i].nc.ip));
-               printf("%s\t%s\t%i\t%s\n", inet_ntoa(sa[i].nc.netmask), ( sa[i].nc.dhcp ? "Yes" : "No" ), sa[i].ports, sa[i].firmware);
-       }
+       for (i = 0; i < nb; i++)
+               printf("% 3d\t%-17s\t%-16.16s\t%-32.32s\t%-15s\t% 5d\t%s\n", i, ether_ntoa(&sa[i].mac), sa[i].product, sa[i].name, inet_ntoa(sa[i].nc.ip), sa[i].ports, sa[i].firmware);
        
        printf("\nfound %i switch(es)\n", nb);
 }
 
 
-int trim (char *txt, int start)
-{
-       char *p;
-       
-       if (txt == NULL)
-               return 0;
-       
-       p = txt + start;
-       for (p--; p >= txt && (*p == ' ' || *p == '\n'); *p-- = 0);
-       
-       return p - txt + 1;
-}
-
-
 int explode (const char *commande, char** tab, int maximum)
 {
        const char *start, *end;