fix -Wshadow compiler warnings

init char array

diff --git a/fb_display.c b/fb_display.c
index dbf7fcada3ea4efce30604f992e7957577d0f49c..ce645a4ed3ee36e0cbc248c64be960f06072ba18 100644 (file)
--- a/fb_display.c
+++ b/fb_display.c
@@ -23,7 +23,6 @@
 #include "gfx.h"
 #include "fb_display.h"
 
-extern unsigned int alpha;
 
 void blit2FB(void *fbbuff,
        uint32_t width, uint32_t height,

diff --git a/gfx.c b/gfx.c
index 3e6e61c841473c6b60249500b8dafcebf8472a7f..20e6267226a50a1b6060321d7ad3d4a0efbcc7b7 100644 (file)
--- a/gfx.c
+++ b/gfx.c
@@ -8,9 +8,9 @@
 
 extern const char NOMEM[];
 
-void RenderBox(int sx, int sy, int ex, int ey, int rad, int col)
+void RenderBox(int _sx, int _sy, int _ex, int _ey, int rad, int col)
 {
-       int F,R=rad,ssx=startx+sx,ssy=starty+sy,dxx=ex-sx,dyy=ey-sy,rx,ry,wx,wy,count;
+       int F,R=rad,ssx=startx+_sx,ssy=starty+_sy,dxx=_ex-_sx,dyy=_ey-_sy,rx,ry,wx,wy,count;
 
        uint32_t *pos = lbb + ssx + stride * ssy;
        uint32_t *pos0, *pos1, *pos2, *pos3, *i;

diff --git a/shellexec.c b/shellexec.c
index f04f0ffd6ee7bc2bde987cc3f98055a2ed62ce1b..a4198ef480d91276177d828df0e9a0eb1bb96ac7 100644 (file)
--- a/shellexec.c
+++ b/shellexec.c
@@ -1256,13 +1256,13 @@ int Get_Menu(int showwait)
        return rv;
 }
 
-void clean_string(char *trstr, char *lcstr)
+void clean_string(char *_trstr, char *lcstr)
 {
        int i;
        char *lcdptr,*lcptr,*tptr;
 
        lcdptr=lcstr;
-       lcptr=trstr;
+       lcptr=_trstr;
        while(*lcptr)
        {
                if(*lcptr=='~')

diff --git a/text.c b/text.c
index 3c47ad5db457625a9bb077b02f73453079a15ff1..3d6eec76096dfe6ba2a38456a04dd5e1a91c4b2e 100644 (file)
--- a/text.c
+++ b/text.c
@@ -360,10 +360,10 @@ int GetStringLen(int _sx, char *string, size_t size)
  * RenderString
  ******************************************************************************/
 
-void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int size, int color)
+void RenderString(char *string, int _sx, int _sy, int maxwidth, int layout, int size, int color)
 {
-       int stringlen, ex, charwidth, i;
-       char rstr[256], *rptr=rstr;
+       int stringlen, _ex, charwidth, i;
+       char rstr[256]={0}, *rptr=rstr;
        int varcolor=color;
 
        strcpy(rstr,string);
@@ -382,21 +382,21 @@ void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int si
        //set alignment
        if(layout != LEFT)
        {
-               stringlen = GetStringLen(sx, string, size);
+               stringlen = GetStringLen(_sx, string, size);
 
                switch(layout)
                {
-                       case CENTER:    if(stringlen < maxwidth) sx += (maxwidth - stringlen)/2;
+                       case CENTER:    if(stringlen < maxwidth) _sx += (maxwidth - stringlen)/2;
                                        break;
 
-                       case RIGHT:     if(stringlen < maxwidth) sx += maxwidth - stringlen;
+                       case RIGHT:     if(stringlen < maxwidth) _sx += maxwidth - stringlen;
                }
        }
 
        //reset kerning
        prev_glyphindex = 0;
 
-       ex = sx + maxwidth;
+       _ex = _sx + maxwidth;
 
        //render string
        while(*rptr != '\0')
@@ -411,16 +411,16 @@ void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int si
                                case 'Y': varcolor=YELLOW; break;
                                case 'B': varcolor=BLUE0; break;
                                case 'S': varcolor=color; break;
-                               case 't': sx=((sx/TABULATOR)+1)*TABULATOR; break;
+                               case 't': _sx=((_sx/TABULATOR)+1)*TABULATOR; break;
                                case 'T':
                                        if(sscanf(rptr+1,"%4d",&i)==1)
                                        {
                                                rptr+=4;
-                                               sx=i;
+                                               _sx=i;
                                        }
                                        else
                                        {
-                                               sx=((sx/TABULATOR)+1)*TABULATOR;
+                                               _sx=((_sx/TABULATOR)+1)*TABULATOR;
                                        }
                                break;
                        }
@@ -428,9 +428,9 @@ void RenderString(char *string, int sx, int sy, int maxwidth, int layout, int si
                }
                else
                {
-                       if ((charwidth = RenderChar(UTF8ToUnicode(&rptr, 1), sx, sy, ex, ((color!=CMCIT) && (color!=CMCST)) ? varcolor : color)) == -1)
+                       if ((charwidth = RenderChar(UTF8ToUnicode(&rptr, 1), _sx, _sy, _ex, ((color!=CMCIT) && (color!=CMCST)) ? varcolor : color)) == -1)
                                return; /* string > maxwidth */
-                       sx += charwidth;
+                       _sx += charwidth;
                }
        }
 }