Squash Warnings: Unused Var/Var set but not used.

6 files changed, 16 insertions, 14 deletions

diff --git a/xps/xpscff.c b/xps/xpscff.c
index 9620ddf94..7c076f43d 100644
--- a/xps/xpscff.c
+++ b/xps/xpscff.c
@@ -514,7 +514,7 @@ xps_read_cff_file(xps_font_t *font, gs_font_type1 *pt1)
 
     /* CFF header */
     {
-        int major, minor, hdrsize, offsize;
+        int major, minor, hdrsize;
 
         if (p + 4 > e)
             return gs_throw(-1, "not enough data for header");
@@ -522,7 +522,7 @@ xps_read_cff_file(xps_font_t *font, gs_font_type1 *pt1)
         major = *p++;
         minor = *p++;
         hdrsize = *p++;
-        offsize = *p++;
+        /*offsize = **/p++;
 
         if (major != 1 || minor != 0)
             return gs_throw(-1, "not a CFF 1.0 file");
diff --git a/xps/xpsfont.c b/xps/xpsfont.c
index 9a19021ac..fb8825a0f 100644
--- a/xps/xpsfont.c
+++ b/xps/xpsfont.c
@@ -167,7 +167,8 @@ xps_load_sfnt_name(xps_font_t *font, char *namep)
 {
     byte *namedata;
     int offset, length;
-    int format, count, stringoffset;
+    /*int format;*/
+    int count, stringoffset;
     int found;
     int i, k;
 
@@ -183,7 +184,7 @@ xps_load_sfnt_name(xps_font_t *font, char *namep)
 
     namedata = font->data + offset;
 
-    format = u16(namedata + 0);
+    /*format = u16(namedata + 0);*/
     count = u16(namedata + 2);
     stringoffset = u16(namedata + 4);
 
diff --git a/xps/xpsglyphs.c b/xps/xpsglyphs.c
index 827d45274..5f1c363d9 100644
--- a/xps/xpsglyphs.c
+++ b/xps/xpsglyphs.c
@@ -434,7 +434,7 @@ xps_parse_glyphs(xps_context_t *ctx,
     char *opacity_mask_uri;
 
     char *bidi_level_att;
-    char *caret_stops_att;
+    /*char *caret_stops_att;*/
     char *fill_att;
     char *font_size_att;
     char *font_uri_att;
@@ -478,7 +478,7 @@ xps_parse_glyphs(xps_context_t *ctx,
      */
 
     bidi_level_att = xps_att(root, "BidiLevel");
-    caret_stops_att = xps_att(root, "CaretStops");
+    /*caret_stops_att = xps_att(root, "CaretStops");*/
     fill_att = xps_att(root, "Fill");
     font_size_att = xps_att(root, "FontRenderingEmSize");
     font_uri_att = xps_att(root, "FontUri");
diff --git a/xps/xpsgradient.c b/xps/xpsgradient.c
index 0d8c6556c..bedbfecdd 100644
--- a/xps/xpsgradient.c
+++ b/xps/xpsgradient.c
@@ -877,9 +877,9 @@ xps_parse_gradient_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dic
     xps_item_t *node;
 
     char *opacity_att;
-    char *interpolation_att;
+    /*char *interpolation_att;*/
     char *spread_att;
-    char *mapping_att;
+    /*char *mapping_att;*/
     char *transform_att;
 
     xps_item_t *transform_tag = NULL;
@@ -898,9 +898,9 @@ xps_parse_gradient_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dic
     int has_opacity = 0;
 
     opacity_att = xps_att(root, "Opacity");
-    interpolation_att = xps_att(root, "ColorInterpolationMode");
+    /*interpolation_att = xps_att(root, "ColorInterpolationMode");*/
     spread_att = xps_att(root, "SpreadMethod");
-    mapping_att = xps_att(root, "MappingMode");
+    /*mapping_att = xps_att(root, "MappingMode");*/
     transform_att = xps_att(root, "Transform");
 
     for (node = xps_down(root); node; node = xps_next(node))
diff --git a/xps/xpstile.c b/xps/xpstile.c
index 684ccf67e..14f389101 100644
--- a/xps/xpstile.c
+++ b/xps/xpstile.c
@@ -239,8 +239,8 @@ xps_parse_tiling_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict,
     char *viewbox_att;
     char *viewport_att;
     char *tile_mode_att;
-    char *viewbox_units_att;
-    char *viewport_units_att;
+    /*char *viewbox_units_att;*/
+    /*char *viewport_units_att;*/
 
     xps_item_t *transform_tag = NULL;
 
@@ -255,8 +255,8 @@ xps_parse_tiling_brush(xps_context_t *ctx, char *base_uri, xps_resource_t *dict,
     viewbox_att = xps_att(root, "Viewbox");
     viewport_att = xps_att(root, "Viewport");
     tile_mode_att = xps_att(root, "TileMode");
-    viewbox_units_att = xps_att(root, "ViewboxUnits");
-    viewport_units_att = xps_att(root, "ViewportUnits");
+    /*viewbox_units_att = xps_att(root, "ViewboxUnits");*/
+    /*viewport_units_att = xps_att(root, "ViewportUnits");*/
 
     for (node = xps_down(root); node; node = xps_next(node))
     {
diff --git a/xps/xpszip.c b/xps/xpszip.c
index 9e36bf8ca..5d931c5b8 100644
--- a/xps/xpszip.c
+++ b/xps/xpszip.c
@@ -112,6 +112,7 @@ xps_read_zip_entry(xps_context_t *ctx, xps_entry_t *ent, unsigned char *outbuf)
         return gs_throw1(-1, "wrong zip local file signature (0x%x)", sig);
 
     version = getshort(ctx->file);
+    version = version; /* Avoid unused variable compiler warning */
     general = getshort(ctx->file);
     if (general & ZIP_ENCRYPTED_FLAG)
         return gs_throw(-1, "zip file content is encrypted");