Cli: refactor, change coding style

[ngadmin] / cli / com_cabletest.c

diff --git a/cli/com_cabletest.c b/cli/com_cabletest.c
index 521ada9b8ecbebb9dc55ce3d9b605549b5fdf0c0..f23763f9e9ce0a898d79724c5a415f6483e7e9d9 100644 (file)
--- a/cli/com_cabletest.c
+++ b/cli/com_cabletest.c
@@ -2,52 +2,50 @@
 #include "commands.h"
 
 
-
-bool do_cabletest (int nb, const char **com, struct ngadmin *nga) {
- 
- bool ret=true;
- const struct swi_attr *sa;
- struct cabletest *ct=NULL;
- int i, j=0, k=0;
- 
- 
- if ( nb<1 ) {
-  printf("Usage: cabletest <port1> [<port2> ...]\n");
-  goto end;
- }
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- ct=malloc(sa->ports*sizeof(struct cabletest));
- memset(ct, 0, sa->ports*sizeof(struct cabletest));
- 
- while ( k<nb ) {
-  ct[j].port=strtol(com[k++], NULL, 0);
-  if ( ct[j].port>=1 && ct[j].port<=sa->ports ) ++j;
- }
- 
- i=ngadmin_cabletest(nga, ct, j);
- if ( i<0 ) {
-  printErrCode(i);
-  ret=false;
-  goto end;
- }
- 
- 
- for (i=0; i<j; ++i) {
-  printf("port %i: %08X %08X\n", ct[i].port, ct[i].v1, ct[i].v2);
- }
- 
- 
- end:
- free(ct);
- 
- return ret;
- 
+bool do_cabletest (int nb, const char **com, struct ngadmin *nga)
+{
+       bool ret = true;
+       const struct swi_attr *sa;
+       struct cabletest *ct = NULL;
+       int i, j=0, k=0;
+       
+       
+       if (nb < 1) {
+               printf("Usage: cabletest <port1> [<port2> ...]\n");
+               goto end;
+       }
+       
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = false;
+               goto end;
+       }
+       
+       ct = malloc(sa->ports * sizeof(struct cabletest));
+       memset(ct, 0, sa->ports * sizeof(struct cabletest));
+       
+       while (k < nb) {
+               ct[j].port = strtol(com[k++], NULL, 0);
+               if (ct[j].port >= 1 && ct[j].port <= sa->ports)
+                       j++;
+       }
+       
+       i = ngadmin_cabletest(nga, ct, j);
+       if (i < 0) {
+               printErrCode(i);
+               ret = false;
+               goto end;
+       }
+       
+       for (i = 0; i < j; i++)
+               printf("port %i: %08X %08X\n", ct[i].port, ct[i].v1, ct[i].v2);
+       
+end:
+       free(ct);
+       
+       return ret;
 }