texk/ps2pkm: Minor cleanup to avoid compiler warnings

git-svn-id: svn://tug.org/texlive/trunk@35324 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 11 insertions, 12 deletions

diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog
index 755e30a4523..b52adda2437 100644
--- a/Build/source/texk/ps2pkm/ChangeLog
+++ b/Build/source/texk/ps2pkm/ChangeLog
@@ -1,6 +1,7 @@
 2014-10-07  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
-	* paths.c, regions.c: Minor cleanup to avoid compiler warnings.
+	* pk2bm.c, paths.c, pkout.c, ps2pk.c, regions.c, t1func.c:
+	Minor cleanup to avoid compiler warnings.
 
 2014-10-07  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
diff --git a/Build/source/texk/ps2pkm/pk2bm.c b/Build/source/texk/ps2pkm/pk2bm.c
index b61a68a4bb8..30c4b736b9e 100644
--- a/Build/source/texk/ps2pkm/pk2bm.c
+++ b/Build/source/texk/ps2pkm/pk2bm.c
@@ -35,6 +35,7 @@
 
 #ifdef WIN32
 #include <fcntl.h>
+#include <io.h>
 #endif
 
 static quarterword lsbf(quarterword u);
@@ -98,7 +99,7 @@ int main(int argc, char *argv[])
    }
 
 #ifdef WIN32
-   setmode(fileno(stdout), _O_BINARY);
+   _setmode(fileno(stdout), _O_BINARY);
 #endif
 
    pkname = argv[0];
diff --git a/Build/source/texk/ps2pkm/pkout.c b/Build/source/texk/ps2pkm/pkout.c
index 1f21f80ffb8..809fd7c6da3 100644
--- a/Build/source/texk/ps2pkm/pkout.c
+++ b/Build/source/texk/ps2pkm/pkout.c
@@ -173,8 +173,8 @@ static int dyn_f, comp_size, cnt;
 static void pk_runlengths(int W, int H, int (*next_pixel)())
 {  int current_value, pixel, i, j, max_counts, first_count;
    int total_pixels, rc, row, col, runlength;
-   int color1, color2, total_pixels2, /* counting equal rows variables */
-       pixels, i1, i2, newrow;
+   int color2, total_pixels2, /* counting equal rows variables */
+       i1, i2, newrow;
 
    first_count = H; max_counts = first_count + H * W;
    if (count == NULL) {
@@ -416,8 +416,7 @@ void pk_char(int char_code, 	/* character code 0..255 */
    	int h_offset, 		/* horizontal offset to reference point */
    	int v_offset, 		/* vertical offset to reference point */
         int (*next_pixel)())	/* user's next pixel generator */
-{  int i, pl, current_value;
-   short two_byte;	/* two_byte quantities? */
+{  int i;
    unsigned short flag_byte;
 
    pk_runlengths(width, height, next_pixel);
diff --git a/Build/source/texk/ps2pkm/ps2pk.c b/Build/source/texk/ps2pkm/ps2pk.c
index a6fb83d89ed..a920b771baa 100644
--- a/Build/source/texk/ps2pkm/ps2pk.c
+++ b/Build/source/texk/ps2pkm/ps2pk.c
@@ -241,11 +241,11 @@ static void add_option(const char *, const char *);
 
 main(int argc, char *argv[])
 {
-   char *argp, c;
+   char c;
    int done, i;
    char *myname = "ps2pk", *psname, *psbasename, *afmname = NULL,
 	*encname = NULL, *psfile = NULL, *psfilebn, pkname[80],
-	*t1inputs, *psrespath, *resourcedb, *AFM_fontname = NULL,
+	*AFM_fontname = NULL,
 	*encodingscheme = NULL;
 
    FontPtr fontptr;
@@ -546,7 +546,7 @@ main(int argc, char *argv[])
  */
 UINT32 old_checksum(encoding ev, int width[256])
 {
-   int i, leftbit ;
+   int i;
    UINT32 s1 = 0, s2 = 0;
    char *p ;
 
@@ -564,7 +564,7 @@ UINT32 old_checksum(encoding ev, int width[256])
  */
 UINT32 checksum(encoding ev, int width[256])
 {
-   int i, leftbit ;
+   int i;
    UINT32 s1 = 0, s2 = 0;
    char *p ;
 
diff --git a/Build/source/texk/ps2pkm/t1funcs.c b/Build/source/texk/ps2pkm/t1funcs.c
index 5f6b8c67269..f33fcdab00f 100644
--- a/Build/source/texk/ps2pkm/t1funcs.c
+++ b/Build/source/texk/ps2pkm/t1funcs.c
@@ -144,7 +144,6 @@ int Type1OpenScalable (ev, ppFont, flags, entry, fileName, vals, format,
        register int i;
        int len,rc;
        struct type1font *type1;
-       char *p;
 
        /* set up default values */
        FontDefaultFormat(&bit, &byte, &glyph, &scan);
@@ -312,7 +311,6 @@ Type1GetGlyphs(pFont, count, chars, charEncoding, glyphCount, glyphs)
     unsigned int numRows;
     CharInfoPtr *glyphsBase;
     register unsigned int c;
-    register CharInfoPtr pci;
     unsigned int r;
     CharInfoPtr pDefault;
     register struct type1font *type1Font;