Avoid shadow declarations

Bitmap.c:906:17: warning: declaration shadows a local variable [-Wshadow]
        unsigned char *image_data;
                       ^
Bitmap.c:799:11: note: previous declaration is here
    char *image_data, *buffer_data;
          ^
Bitmap.c:907:8: warning: declaration shadows a local variable [-Wshadow]
        char *buffer_data;
              ^
Bitmap.c:799:24: note: previous declaration is here
    char *image_data, *buffer_data;
                       ^

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/Bitmap.c b/Bitmap.c
index bcab0ab..76464f9 100644
--- a/Bitmap.c
+++ b/Bitmap.c
@@ -903,20 +903,20 @@ Initialize(Widget wrequest, Widget wnew, ArgList argv, Cardinal *argc)
     {
 	int status;
 	XImage *image, *buffer;
-	unsigned char *image_data;
-	char *buffer_data;
+	unsigned char *image_data2;
+	char *buffer_data2;
 	unsigned int width, height;
 	int x_hot, y_hot;
 
 	status = XmuReadBitmapDataFromFile(new->bitmap.filename,
-					   &width, &height, &image_data,
+					   &width, &height, &image_data2,
 					   &x_hot, &y_hot);
 	if (status == BitmapSuccess) {
 
-	    buffer_data = CreateCleanData(Length(width, height));
+	    buffer_data2 = CreateCleanData(Length(width, height));
 
-	    image = CreateBitmapImage(new, (char *)image_data, width, height);
-	    buffer = CreateBitmapImage(new, buffer_data, width, height);
+	    image = CreateBitmapImage(new, (char *)image_data2, width, height);
+	    buffer = CreateBitmapImage(new, buffer_data2, width, height);
 
 	    TransferImageData(new->bitmap.image, buffer);