diff mbox

[U-Boot,2/3] Fix a few gcc warnings.

Message ID OF833C8DA9.727EDC2B-ONC125787C.0081D5F1-C125787C.0081FB5D@transmode.se
State Changes Requested
Headers show

Commit Message

Joakim Tjernlund April 24, 2011, 11:39 p.m. UTC 
Wolfgang Denk <wd@denx.de> wrote on 2011/04/25 00:14:58:
>
> Dear Joakim Tjernlund,
>
> In message <1303633774-22961-3-git-send-email-Joakim.Tjernlund@transmode.se> you wrote:
> > Noticed while building all of mpc8xx
>
> Please include in the commit message what the compiler warnings were,
> and which compiler version was used to produce these warnings.
>
>
> > diff --git a/examples/standalone/timer.c b/examples/standalone/timer.c
> > index 834cc9a..a4d4581 100644
> > --- a/examples/standalone/timer.c
> > +++ b/examples/standalone/timer.c
> > @@ -186,7 +186,7 @@ int timer (int argc, char * const argv[])
> >     /* clear all events */
> >     *hwp->terp = (CPMT_EVENT_CAP | CPMT_EVENT_REF);
> >
> > -   printf (usage);
> > +   printf("%s", usage);
>
> I dislike this change.  Which warning does the old code produce for
> you?

Updated patch below with the warnings in the commit msg:
From 6f84407cd1afdd9c45c28219985fc4e05e2e35dc Mon Sep 17 00:00:00 2001
From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Sat, 23 Apr 2011 11:43:51 +0200
Subject: [PATCH 2/3] Fix a few gcc warnings.

Noticed while building all of mpc8xx
Warnings fixed are:
timer.c: In function 'timer':
timer.c:189: warning: format not a string literal and no format arguments
timer.c:258: warning: format not a string literal and no format arguments
atm.c: In function 'atmUnload':
atm.c:99: warning: array subscript is above array bounds
atm.c: In function 'atmLoad':
atm.c:65: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_pop_int':
codec.c:678: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_cop_short':
codec.c:585: warning: array subscript is above array bounds
codec.c: In function 'codsp_write_sop_int':
codec.c:512: warning: array subscript is above array bounds

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
---

 -V2: Add descprition of warnings.

 board/netta/codec.c         |    6 +++---
 board/siemens/IAD210/atm.c  |    4 ++--
 examples/standalone/timer.c |    4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

--
1.7.3.4
diff mbox

Patch

diff --git a/board/netta/codec.c b/board/netta/codec.c
index 844aa18..c8d31d7 100644
--- a/board/netta/codec.c
+++ b/board/netta/codec.c
@@ -502,7 +502,7 @@  void codsp_write_sop_short(int duslic_id, int channel, unsigned char regno, unsi

 void codsp_write_sop_int(int duslic_id, int channel, unsigned char regno, unsigned int val)
 {
-	unsigned char cmd[5];
+	unsigned char cmd[6];

 	cmd[0] = CODSP_WR | CODSP_ADR(channel) | CODSP_CMD_SOP;
 	cmd[1] = regno;
@@ -577,7 +577,7 @@  void codsp_write_cop_char(int duslic_id, int channel, unsigned char addr, unsign

 void codsp_write_cop_short(int duslic_id, int channel, unsigned char addr, unsigned short val)
 {
-	unsigned char cmd[3];
+	unsigned char cmd[4];

 	cmd[0] = CODSP_WR | CODSP_OP | CODSP_ADR(channel) | CODSP_CMD_COP;
 	cmd[1] = addr;
@@ -668,7 +668,7 @@  void codsp_write_pop_short (int duslic_id, int channel, unsigned char regno,
 void codsp_write_pop_int (int duslic_id, int channel, unsigned char regno,
 			  unsigned int val)
 {
-	unsigned char cmd[5];
+	unsigned char cmd[6];

 	cmd[0] = CODSP_WR | CODSP_ADR (channel) | CODSP_CMD_POP;
 	cmd[1] = regno;
diff --git a/board/siemens/IAD210/atm.c b/board/siemens/IAD210/atm.c
index e599c10..40aad0a 100644
--- a/board/siemens/IAD210/atm.c
+++ b/board/siemens/IAD210/atm.c
@@ -62,7 +62,7 @@  int atmLoad()
   volatile iop8xx_t      *iop    = &immap->im_ioport;

   timers->cpmt_tgcr &=  0x0FFF; SYNC;             /* Disable Timer 4 */
-  immap->im_cpm.cp_scc[4].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */
+  immap->im_cpm.cp_scc[3].scc_gsmrl = 0x0; SYNC; /* Disable SCC4 */
   iop->iop_pdpar &= 0x3FFF; SYNC;                 /* Disable SAR and UTOPIA */

   if ( atmMemInit() != OK ) return ERROR;
@@ -96,7 +96,7 @@  void atmUnload()
   volatile iop8xx_t      *iop    = &immap->im_ioport;

   timers->cpmt_tgcr &=  0x0FFF; SYNC;             /* Disable Timer 4 */
-  immap->im_cpm.cp_scc[4].scc_gsmrl = 0x0; SYNC;  /* Disable SCC4 */
+  immap->im_cpm.cp_scc[3].scc_gsmrl = 0x0; SYNC;  /* Disable SCC4 */
   iop->iop_pdpar &= 0x3FFF; SYNC;                 /* Disable SAR and UTOPIA */
   g_atm.loaded = FALSE;
 }
diff --git a/examples/standalone/timer.c b/examples/standalone/timer.c
index 834cc9a..a4d4581 100644
--- a/examples/standalone/timer.c
+++ b/examples/standalone/timer.c
@@ -186,7 +186,7 @@  int timer (int argc, char * const argv[])
 	/* clear all events */
 	*hwp->terp = (CPMT_EVENT_CAP | CPMT_EVENT_REF);

-	printf (usage);
+	printf("%s", usage);
 	running = 0;
 	while ((c = getc()) != 'q') {
 	    if (c == 'b') {
@@ -255,7 +255,7 @@  int timer (int argc, char * const argv[])
 	    } else {
 		printf ("\nEnter: q - quit, b - start timer, e - stop timer, ? - get status\n");
 	    }
-	    printf (usage);
+	    printf("%s", usage);
 	}
 	if (running) {
 		printf ("Stopping timer\n");