Get rid of warning variable hides local / global declaration.

Author: blonder

Diff for: gui.c

@@ -783,10 +783,10 @@ void tzsettitle( struct textzone *ptz, char *title )
   ptz->py = oy;
 }
 
-SDL_bool in_textzone( struct textzone *tz, int x, int y )
+SDL_bool in_textzone( struct textzone *tz_, int x, int y )
 {
-  if( ( x >= tz->x ) && ( x < (tz->x+tz->w*8) ) &&
-      ( y >= tz->y ) && ( y < (tz->y+tz->h*12) ) )
+  if( ( x >= tz_->x ) && ( x < (tz_->x+tz_->w*8) ) &&
+      ( y >= tz_->y ) && ( y < (tz_->y+tz_->h*12) ) )
   {
     return SDL_TRUE;
   }

Diff for: gui_win.c

@@ -89,20 +89,20 @@ char* get_clipboard_text_win(void)
   return text;
 }
 
-static void set_clipboard_text_win(const char* text)
+static void set_clipboard_text_win(const char* text_)
 {
     if (!initialized)
         return;
 
-    if ( text != NULL )
+    if ( text_ != NULL )
     {
         if ( OpenClipboard(g_SDL_Window) )
         {
-            HANDLE hMem = GlobalAlloc((GMEM_MOVEABLE|GMEM_DDESHARE), strlen(text)+1);
+            HANDLE hMem = GlobalAlloc((GMEM_MOVEABLE|GMEM_DDESHARE), strlen(text_)+1);
             if ( hMem != NULL )
             {
                 char* dst = (char*)GlobalLock(hMem);
-                memcpy(dst, text, strlen(text)+1);
+                memcpy(dst, text_, strlen(text_)+1);
                 GlobalUnlock(hMem);
                 EmptyClipboard();
                 SetClipboardData(CF_TEXT, hMem);
@@ -141,7 +141,7 @@ SDL_bool clipboard_copy( struct machine *oric )
         return SDL_FALSE;
 
     int line, col, i;
-    char text[40 * 28 + 28 + 1];
+    char text_[40 * 28 + 28 + 1];
     unsigned char *vidmem = (&oric->mem[oric->vid_addr]);
 
     for (i = 0, line = 0; line < 28; line++) {
@@ -153,16 +153,16 @@ SDL_bool clipboard_copy( struct machine *oric )
             }
 
             if (c < ' ' || c == 127) {
-                text[i++] = ' ';
+                text_[i++] = ' ';
             } else
-                text[i++] = (char)c;
+                text_[i++] = (char)c;
         }
-        text[i++] = '\n';
+        text_[i++] = '\n';
     }
-    text[i++] = '\0';
-    //printf("%s\n", text);
+    text_[i++] = '\0';
+    //printf("%s\n", text_);
 
-    set_clipboard_text_win(text);
+    set_clipboard_text_win(text_);
     return SDL_TRUE;
 }
 

Diff for: main.c

@@ -1187,9 +1187,9 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
     }
     else
     {
-      int i = 0;
+      int off = 0;
       unsigned int addr;
-      if( !mon_getnum( oric, &addr, sto->start_breakpoint, &i, SDL_FALSE, SDL_FALSE, SDL_FALSE, SDL_TRUE ) )
+      if( !mon_getnum( oric, &addr, sto->start_breakpoint, &off, SDL_FALSE, SDL_FALSE, SDL_FALSE, SDL_TRUE ) )
       {
         error_printf( "Invalid breakpoint" );
         free( sto );

Diff for: monitor.c

@@ -3987,18 +3987,18 @@ static unsigned int steppy_step( struct machine *oric )
   return oric->cpu.icycles;
 }
 
-static SDL_bool clickzone( struct textzone *tz, int *tx, int *ty, SDL_bool *dblclk )
+static SDL_bool clickzone( struct textzone *tz_, int *tx, int *ty, SDL_bool *dblclk )
 {
   int dx, dy;
 
-  if( !in_textzone( tz, leftclick[0].x, leftclick[0].y ) )
+  if( !in_textzone( tz_, leftclick[0].x, leftclick[0].y ) )
     return SDL_FALSE;
 
-  *tx = (leftclick[0].x - tz->x) / 8;
-  *ty = (leftclick[0].y - tz->y) / 12;
+  *tx = (leftclick[0].x - tz_->x) / 8;
+  *ty = (leftclick[0].y - tz_->y) / 12;
 
-  dx = (leftclick[1].x - tz->x) / 8;
-  dy = (leftclick[1].y - tz->y) / 12;
+  dx = (leftclick[1].x - tz_->x) / 8;
+  dy = (leftclick[1].y - tz_->y) / 12;
 
   if( ( (*tx) == dx ) && ( (*ty) == dy ) && ( (leftclick[0].time-leftclick[1].time) < 1000 ) )
   {

Diff for: snapshot.c

@@ -1141,7 +1141,7 @@ SDL_bool load_snapshot(struct machine *oric, char *filename)
     case DRV_PRAVETZ:
     {
       Uint8 tmp[PRAV_TRACKS_PER_DISK*PRAV_RAW_TRACK_SIZE*2];
-      Uint32 offs;
+      Uint32 offs_;
 
       /* Get the pravetz block */
       blk = load_block(oric, "PRV\x00", f, SDL_TRUE, 9+2*10, SDL_TRUE);
@@ -1250,12 +1250,12 @@ SDL_bool load_snapshot(struct machine *oric, char *filename)
 
         sprintf(oric->wddisk.disk[i]->filename, "%s%cSNAPDISK%d.DSK", diskpath, PATHSEP, i);
 
-        offs = getu32(blk);
+        offs_ = getu32(blk);
         oric->pravetz.drv[i].pimg = oric->wddisk.disk[i];
-        if (offs == 0xffffffff)
+        if (offs_ == 0xffffffff)
           oric->pravetz.drv[i].sector_ptr = NULL;
         else
-          oric->pravetz.drv[i].sector_ptr = &oric->pravetz.drv[i].pimg->rawimage[offs];
+          oric->pravetz.drv[i].sector_ptr = &oric->pravetz.drv[i].pimg->rawimage[offs_];
 
         blk->id[0] = 0; // Don't find this one again
         free_block(blk);