X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=cli%2Fcommon.c;h=80f3f522fc048981c595f2ad1d126c251cfb9c58;hb=8d96dbb186138459117b82268407c0fb45339e8f;hp=59f7058bfbae5ce360a885ed87d9d6d777be5085;hpb=0eb28539a42fcb01078c7bca793c741317656f14;p=ngadmin

diff --git a/cli/common.c b/cli/common.c
index 59f7058..80f3f52 100644
--- a/cli/common.c
+++ b/cli/common.c
@@ -2,158 +2,152 @@
 #include "common.h"
 
 
-
-
-
-
-
-void printErrCode (int err) {
- 
- 
- switch ( err ) {
-  case ERR_OK: /*printf("ok\n");*/ break;
-  case ERR_NET: printf("network error\n"); break;
-  case ERR_NOTLOG: printf("no switch selected\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;
-  default: printf("unknown status code (%i)\n", err);
- }
- 
- 
+void printErrCode (int err)
+{
+	switch (err) {
+	case ERR_OK:
+		break;
+	
+	case ERR_NET:
+		printf("network error\n");
+		break;
+	
+	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;
+	
+	default:
+		printf("unknown status code (%i)\n", err);
+	}
 }
 
 
-
-
-const char* bitrates[]={
- "nl", 
- "512K", 
- "1M", 
- "2M",  
- "4M", 
- "8M", 
- "16M", 
- "32M", 
- "64M", 
- "128M", 
- "256M", 
- "512M", 
- NULL
+const char* const bitrates[] = {
+	"nl",
+	"512K",
+	"1M",
+	"2M",
+	"4M",
+	"8M",
+	"16M",
+	"32M",
+	"64M",
+	"128M",
+	"256M",
+	"512M",
+	NULL
 };
 
 
-const char* prio[]={
- NULL, 
- "high", 
- "medium", 
- "normal", 
- "low", 
- 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;
- 
+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;
- 
+char parsePrio (const char *s)
+{
+	int i;
+	
+	for (i = 1; prio[i] != NULL && strcasecmp(prio[i], s) != 0; i++);
+	
+	return (char)i;
 }
 
 
-
-void displaySwitchTab (const struct swi_attr *sa, int nb) {
- 
- int i=0;
- 
- 
- if ( nb==0 ) {
-  printf("no switch found\n");
-  return;
- }
- 
- 
- printf("Num\tMac\t\t\tProduct\t\tName\t\t\tIP/mask\t\t\tDHCP\tPorts\tFirmware\n");
- 
- for (i=0; i<nb; ++i) {
-  printf("%i\t%s\t%s\t\t%s\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);
- }
- 
- printf("\nfound %i switch(es)\n", nb);
- 
- 
+void displaySwitchTab (const struct swi_attr *sa, int nb)
+{
+	int i=0;
+	
+	if (nb == 0) {
+		printf("no switch found\n");
+		return;
+	}
+	
+	printf("Num\tMac\t\t\tProduct\t\tName\t\t\tIP/mask\t\t\tDHCP\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);
+	}
+	
+	printf("\nfound %i switch(es)\n", nb);
 }
 
 
-
-// ----------------------------
-int trim (char *txt, int start) {
- 
- char *p, c;
- 
- 
- if ( txt==NULL ) {
-  return 0;
- }
- 
- //for (p=txt; *p!=0; p++);
- p=txt+start;
- for (p--; p>=txt && ( (c=*p)==' ' || c=='\n' ); *p--=0);
- 
- 
- return p-txt+1;
- 
+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;
- char c;
- int n=0, len;
- 
- 
- for (end=commande; ; n++) {
-  
-  for (start=end; (c=*start)==' ' && c!=0; start++);
-  for (end=start; ( (c=*end)!=' ' || n>=maximum-1 ) && c!=0; end++);
-  
-  if ( (len=end-start)==0 ) {
-   break;
-  }
-  
-  tab[n]=malloc(sizeof(char)*(len+1));
-  memcpy(tab[n], start, len);
-  tab[n][len]=0;
-  
- }
- 
- 
- return n;
- 
+int explode (const char *commande, char** tab, int maximum)
+{
+	const char *start, *end;
+	int n = 0, len;
+	
+	
+	for (end = commande; ; n++) {
+		for (start = end; *start == ' ' && *start != 0; start++);
+		for (end = start; (*end != ' ' || n >= maximum - 1 ) && *end != 0; end++);
+		
+		len = end - start;
+		if (len == 0)
+			break;
+		
+		tab[n] = malloc(sizeof(char) * (len + 1));
+		memcpy(tab[n], start, len);
+		tab[n][len] = 0;
+	}
+	
+	
+	return n;
 }