Cli: refactor, change coding style

[ngadmin] / cli / com_firmware.c

diff --git a/cli/com_firmware.c b/cli/com_firmware.c
index f2b4732b568feca7e7d786e41cc5b5692cc75945..cc931fecf30d40699a694cb84d14e7c1e0f2f228 100644 (file)
--- a/cli/com_firmware.c
+++ b/cli/com_firmware.c
@@ -2,59 +2,53 @@
 #include "commands.h"
 
 
-
-bool do_firmware_show (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga) {
- 
- const struct swi_attr *sa;
- bool ret=true;
- 
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- puts(sa->firmware);
- 
- 
- end:
- 
- return ret;
- 
+bool do_firmware_show (int nb UNUSED, const char **com UNUSED, struct ngadmin *nga)
+{
+       const struct swi_attr *sa;
+       bool ret = true;
+       
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = false;
+               goto end;
+       }
+       
+       puts(sa->firmware);
+       
+end:
+       
+       return ret;
 }
 
 
-
-bool do_firmware_upgrade (int nb, const char **com UNUSED, struct ngadmin *nga) {
- 
- const struct swi_attr *sa;
- bool ret=true;
- int i;
- 
- 
- if ( nb!=1 ) {
-  printf("Usage: firmware upgrade <file>\n");
-  ret=false;
-  goto end;
- }
- 
- if ( (sa=ngadmin_getCurrentSwitch(nga))==NULL ) {
-  printf("must be logged\n");
-  ret=false;
-  goto end;
- }
- 
- 
- i=ngadmin_upgradeFirmware(nga, com[0]);
- printErrCode(i);
- 
- 
- end:
- 
- return ret;
- 
+bool do_firmware_upgrade (int nb, const char **com, struct ngadmin *nga)
+{
+       const struct swi_attr *sa;
+       bool ret = true;
+       int i;
+       
+       
+       if (nb != 1) {
+               printf("Usage: firmware upgrade <file>\n");
+               ret = false;
+               goto end;
+       }
+       
+       sa = ngadmin_getCurrentSwitch(nga);
+       if (sa == NULL) {
+               printf("must be logged\n");
+               ret = false;
+               goto end;
+       }
+       
+       i = ngadmin_upgradeFirmware(nga, com[0]);
+       printErrCode(i);
+       
+end:
+       
+       return ret;
 }
 
 
-