diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-07-04 02:46:48 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2014-07-04 02:46:48 +0000 |
commit | 701c8ccc2fa923b76e7d14dbd5c3d0b77b142f3c (patch) | |
tree | 51501e78f5e9356a02e60b907f927140324db4b1 /Build | |
parent | 1adcd6abd66da3bfd2d305c5a14042eda60d0874 (diff) |
Remove unused variables
git-svn-id: svn://tug.org/texlive/trunk@34516 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/texk/web2c/xetexdir/ChangeLog | 12 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/image/bmpimage.c | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/image/jpegimage.c | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/image/mfileio.c | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/xetexdir/image/pngimage.c | 4 |
5 files changed, 13 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog index 90692b0e52c..ab488f83fe8 100644 --- a/Build/source/texk/web2c/xetexdir/ChangeLog +++ b/Build/source/texk/web2c/xetexdir/ChangeLog @@ -1,8 +1,14 @@ 2014-06-04 Akira Kakuto <kakuto@fuk.kindai.ac.jp> - * xetex.web: Remove unused variables k,and l from function - get_strings_started, and q, and r from procedure - set_math_char(). + * xetex.web: Remove unused variables k,and l in function + get_strings_started, and q, and r in procedure set_math_char(). + * image/mfileio.c: Change type of a variable i in mfgets() in order to + supress warnings. + * image/bmpimage.c: Remove an unused variable i in bmp_scan_file(). + * image/jpegimage.c: Remove an unused variable rational_value in + read_APP1_Exif(). + * image/pngimage.c: Remove unused variables stream_data_ptr, + trans_type, and rowbytes in png_scan_file(). 2014-05-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/web2c/xetexdir/image/bmpimage.c b/Build/source/texk/web2c/xetexdir/image/bmpimage.c index 6cc6bcb0619..906413370a8 100644 --- a/Build/source/texk/web2c/xetexdir/image/bmpimage.c +++ b/Build/source/texk/web2c/xetexdir/image/bmpimage.c @@ -108,7 +108,6 @@ bmp_scan_file(struct bmp_info *info, FILE *fp) long psize; /* Bytes per palette color: 3 for OS2, 4 for Win */ unsigned short bit_count; /* Bits per pix */ int num_palette, flip; - int i; unsigned long biXPelsPerMeter, biYPelsPerMeter; p = buf; diff --git a/Build/source/texk/web2c/xetexdir/image/jpegimage.c b/Build/source/texk/web2c/xetexdir/image/jpegimage.c index 0f1fe05cb4b..aa808b327cb 100644 --- a/Build/source/texk/web2c/xetexdir/image/jpegimage.c +++ b/Build/source/texk/web2c/xetexdir/image/jpegimage.c @@ -288,7 +288,6 @@ read_APP1_Exif (struct JPEG_info *j_info, FILE *fp, unsigned short length) unsigned char *tiff_header; char bigendian; int i; - double rational_value; int num_fields, tag, type, count, value, num, den; double xres = 72.0; double yres = 72.0; diff --git a/Build/source/texk/web2c/xetexdir/image/mfileio.c b/Build/source/texk/web2c/xetexdir/image/mfileio.c index e6c1a229850..977f74b165c 100644 --- a/Build/source/texk/web2c/xetexdir/image/mfileio.c +++ b/Build/source/texk/web2c/xetexdir/image/mfileio.c @@ -112,7 +112,9 @@ long file_size (FILE *file) /* Unlike fgets, mfgets works with \r, \n, or \r\n end of lines. */ char *mfgets (char *buffer, unsigned long length, FILE *file) { - int ch = 0, i = 0; + int ch = 0; + unsigned long i = 0; + while (i < length-1 && (ch = fgetc (file)) >= 0 && ch != '\n' && ch != '\r') buffer[i++] = ch; buffer[i] = 0; diff --git a/Build/source/texk/web2c/xetexdir/image/pngimage.c b/Build/source/texk/web2c/xetexdir/image/pngimage.c index 42279345881..27e74fbbfc3 100644 --- a/Build/source/texk/web2c/xetexdir/image/pngimage.c +++ b/Build/source/texk/web2c/xetexdir/image/pngimage.c @@ -111,13 +111,11 @@ check_for_png (FILE *png_file) int png_scan_file (struct png_info *info, FILE *png_file) { - png_bytep stream_data_ptr; - int trans_type; /* Libpng stuff */ png_structp png_ptr; png_infop png_info_ptr; png_byte bpc, color_type; - png_uint_32 width, height, rowbytes; + png_uint_32 width, height; rewind (png_file); png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); |