Skip to contentSkip to conversation

bedbug_860.c: Fix return type to silence compile warnings.

PATCH Superseded Wolfgang Denk 1 participant 3 messages Aug 18, 2010 – Sep 8, 2010 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 bedbug_860.c: Fix return type to silence compile warnings.

commit 47e26b1b "cmd_usage(): simplify return code handling" caused the following compile warnings:

bedbug_860.c: In function 'bedbug860_do_break':
bedbug_860.c:73: warning: 'return' with a value, in function returning void bedbug_860.c:121: warning: 'return' with a value, in function returning void

Fix the return type.

Actually the while file could need some cleanup - commands should return proper error codes, and there are coding style issues. => To be fixed later.

---
 arch/powerpc/cpu/mpc8xx/bedbug_860.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc8xx/bedbug_860.c +4 -2
index 83db035..1a9c0ba 100644
@@ -69,8 +69,10 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
   int		which_bp;       /* Breakpoint number    */
   /* -------------------------------------------------- */
 
-  if (argc < 2)
-    return cmd_usage(cmdtp);
+  if (argc < 2) {
+    cmd_usage(cmdtp);
+    return;
+  }
 
   /* Turn off a breakpoint */
 
Signature · 1 line
1.7.2.1
#1 lore raw

PATCH v2 1/1 bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.

commit 47e26b1b "cmd_usage(): simplify return code handling" caused the following compile warnings:

bedbug_860.c: In function 'bedbug860_do_break':
bedbug_860.c:73: warning: 'return' with a value, in function returning void bedbug_860.c:121: warning: 'return' with a value, in function returning void

Fix the return type.

Actually these files could need some cleanup - commands should return proper error codes, and there are coding style issues. => To be fixed later.

---
Changes since V1: fix other occurrences of the same issue, too.

 arch/powerpc/cpu/mpc8260/bedbug_603e.c |   12 ++++++++----
 arch/powerpc/cpu/mpc8xx/bedbug_860.c   |   12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)
arch/powerpc/cpu/mpc8260/bedbug_603e.c +8 -4
index 89193a3..92f8957 100644
@@ -70,8 +70,10 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
   int		which_bp;       /* Breakpoint number    */
   /* -------------------------------------------------- */
 
-  if (argc < 2)
-    return cmd_usage(cmdtp);
+  if (argc < 2) {
+    cmd_usage(cmdtp);
+    return;
+  }
 
   /* Turn off a breakpoint */
 
@@ -114,8 +116,10 @@ void bedbug603e_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
 
   if(!(( isdigit( argv[ 1 ][ 0 ] )) ||
 	(( argv[ 1 ][ 0 ] >= 'a' ) && ( argv[ 1 ][ 0 ] <= 'f' )) ||
-	(( argv[ 1 ][ 0 ] >= 'A' ) && ( argv[ 1 ][ 0 ] <= 'F' ))))
-    return cmd_usage(cmdtp);
+	(( argv[ 1 ][ 0 ] >= 'A' ) && ( argv[ 1 ][ 0 ] <= 'F' )))) {
+    cmd_usage(cmdtp);
+    return;
+  }
 
   addr = simple_strtoul( argv[ 1 ], NULL, 16 );
 
arch/powerpc/cpu/mpc8xx/bedbug_860.c +8 -4
index 83db035..c0016f7 100644
@@ -69,8 +69,10 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
   int		which_bp;       /* Breakpoint number    */
   /* -------------------------------------------------- */
 
-  if (argc < 2)
-    return cmd_usage(cmdtp);
+  if (argc < 2) {
+    cmd_usage(cmdtp);
+    return;
+  }
 
   /* Turn off a breakpoint */
 
@@ -117,8 +119,10 @@ void bedbug860_do_break (cmd_tbl_t *cmdtp, int flag, int argc,
 
   /* Set a breakpoint@the address */
 
-  if( !isdigit( argv[ 1 ][ 0 ]))
-    return cmd_usage(cmdtp);
+  if( !isdigit( argv[ 1 ][ 0 ])) {
+    cmd_usage(cmdtp);
+    return;
+  }
 
   addr = simple_strtoul( argv[ 1 ], NULL, 16 ) & 0xfffffffc;
 
Signature · 1 line
1.7.2.1
#2 lore raw

PATCH v2 1/1 bedbug_860.c, bedbug_603e.c: Fix return type to silence compile warnings.

Quoted 13 lines · In message <[email protected]> you wrote:

commit 47e26b1b "cmd_usage(): simplify return code handling" caused the following compile warnings:

bedbug_860.c: In function 'bedbug860_do_break':
bedbug_860.c:73: warning: 'return' with a value, in function returning void bedbug_860.c:121: warning: 'return' with a value, in function returning void

Fix the return type.

Actually these files could need some cleanup - commands should return proper error codes, and there are coding style issues. => To be fixed later.

Quoted 7 lines

---
Changes since V1: fix other occurrences of the same issue, too.

 arch/powerpc/cpu/mpc8260/bedbug_603e.c |   12 ++++++++----
 arch/powerpc/cpu/mpc8xx/bedbug_860.c   |   12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

Aplied.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
What we anticipate seldom occurs;  what  we  least  expect  generally
happens.                                          - Bengamin Disraeli