Cli: refactor, change coding style

[ngadmin] / cli / com_ports.c

diff --git a/cli/com_ports.c b/cli/com_ports.c
index baa8c8f3a6fe3dcca1c36deae8902e46195553af..7c3fbb22b6ca6ec57764f311ef935bfb4bad760b 100644 (file)
--- a/cli/com_ports.c
+++ b/cli/com_ports.c
@@ -2,104 +2,110 @@
 #include "commands.h"
 
 
-
-bool do_ports_state (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga) {
- 
- int i;
- const struct swi_attr *sa;
- unsigned char *ports=NULL;
- bool ret=true;
- 
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- 
- ports=malloc(sa->ports*sizeof(unsigned char));
- if ( (i=ngadmin_getPortsStatus(nga, ports))<0 ) {
-  printErrCode(i);
-  ret=false;
-  goto end;
- }
- 
- for (i=0; i<sa->ports; i++) {
-  printf("port %i: ", i+1);
-  switch ( ports[i] ) {
-   case 0: printf("down"); break;
-   case SPEED_10: printf("up, 10M"); break;
-   case SPEED_100: printf("up, 100M"); break;
-   case SPEED_1000: printf("up, 1000M"); break;
-   default: printf("unknown (%i)", ports[i]);
-  }
-  putchar('\n');
- }
- 
- end:
- free(ports);
- 
- 
- return ret;
- 
+bool do_ports_state (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga)
+{
+       int i;
+       const struct swi_attr *sa;
+       unsigned char *ports = NULL;
+       bool ret = true;
+       
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = false;
+               goto end;
+       }
+       
+       ports = malloc(sa->ports * sizeof(unsigned char));
+       i = ngadmin_getPortsStatus(nga, ports);
+       if (i < 0) {
+               printErrCode(i);
+               ret = false;
+               goto end;
+       }
+       
+       for (i = 0; i < sa->ports; i++) {
+               printf("port %i: ", i + 1);
+               switch (ports[i]) {
+               
+               case 0:
+                       printf("down");
+                       break;
+               
+               case SPEED_10:
+                       printf("up, 10M");
+                       break;
+               
+               case SPEED_100:
+                       printf("up, 100M");
+                       break;
+               
+               case SPEED_1000:
+                       printf("up, 1000M");
+                       break;
+               
+               default:
+                       printf("unknown (%i)", ports[i]);
+               }
+               putchar('\n');
+       }
+       
+end:
+       free(ports);
+       
+       
+       return ret;
 }
 
 
-
-bool do_ports_statistics_reset (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga) {
- 
- int i;
- 
- 
- if ( ngadmin_getCurrentSwitch(nga)==NULL ) {
-  printf("must be logged\n");
-  return false;
- }
- 
- i=ngadmin_resetPortsStatistics(nga);
- printErrCode(i);
- 
- 
- return true;
- 
+bool do_ports_statistics_reset (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga)
+{
+       int i;
+       
+       if (ngadmin_getCurrentSwitch(nga) == NULL) {
+               printf("must be logged\n");
+               return false;
+       }
+       
+       i = ngadmin_resetPortsStatistics(nga);
+       printErrCode(i);
+       
+       return true;
 }
 
 
-
-bool do_ports_statistics_show (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga) {
- 
- int i;
- const struct swi_attr *sa;
- bool ret=true;
- struct port_stats *ps=NULL;
- 
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- ps=calloc(sa->ports, sizeof(struct port_stats));
- if ( (i=ngadmin_getPortsStatistics(nga, ps))<0 ) {
-  printErrCode(i);
-  ret=false;
-  goto end;
- }
- 
- printf("Port\tReceived\tSent\tCRC errors\n");
- for (i=0; i<sa->ports; ++i) {
-  printf("% 4i%12llu%12llu%14llu\n", i+1, ps[i].recv, ps[i].sent, ps[i].crc);
- }
- 
- end:
- free(ps);
- 
- 
- return ret;
- 
+bool do_ports_statistics_show (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga)
+{
+       int i;
+       const struct swi_attr *sa;
+       bool ret = true;
+       struct port_stats *ps = NULL;
+       
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = false;
+               goto end;
+       }
+       
+       ps = calloc(sa->ports, sizeof(struct port_stats));
+       i = ngadmin_getPortsStatistics(nga, ps);
+       if (i < 0) {
+               printErrCode(i);
+               ret = false;
+               goto end;
+       }
+       
+       printf("Port\tReceived\tSent\tCRC errors\n");
+       for (i = 0; i < sa->ports; i++)
+               printf("% 4i%12llu%12llu%14llu\n", i + 1, ps[i].recv, ps[i].sent, ps[i].crc);
+       
+end:
+       free(ps);
+       
+       return ret;
 }
 
 
-