diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-08 09:58:07 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-06-08 09:58:07 +0000 |
commit | 791212e8c96abfefb2c03415708680b5fdaf5780 (patch) | |
tree | 1d46fdeb25327f8aa3863d2fb525b0c47aa83ac9 | |
parent | 70e988f4f07d3d299c112fc190ecd5f21b7bb25e (diff) |
always use unsigned short vars/vals with "%hu" format spec
git-svn-id: svn://tug.org/texlive/trunk@18813 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/dvipdfmx/ChangeLog.TL | 8 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/dpxfile.c | 2 | ||||
-rw-r--r-- | Build/source/texk/dvipdfmx/src/pdfobj.c | 4 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/ChangeLog.TL | 5 | ||||
-rw-r--r-- | Build/source/texk/xdvipdfmx/src/dpxfile.c | 2 |
5 files changed, 17 insertions, 4 deletions
diff --git a/Build/source/texk/dvipdfmx/ChangeLog.TL b/Build/source/texk/dvipdfmx/ChangeLog.TL index ac39fbf565c..d71d2e2000b 100644 --- a/Build/source/texk/dvipdfmx/ChangeLog.TL +++ b/Build/source/texk/dvipdfmx/ChangeLog.TL @@ -1,6 +1,14 @@ ChangeLog.TL: TeX Live (TL) changes for dvipdfmx ================================================ +2010-06-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + Solaris9 doesn't support "%hhu". + * src/dpxfile.c (dpx_file_apply_filter): + Use (unsigned short) version with "%hu". + * src/pdfobj.c (pdf_open, check_for_pdf_version): Declare minor + as unsigned short for use with "%hu". + 2010-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON. diff --git a/Build/source/texk/dvipdfmx/src/dpxfile.c b/Build/source/texk/dvipdfmx/src/dpxfile.c index 24ab7106e7c..2824aaeb124 100644 --- a/Build/source/texk/dvipdfmx/src/dpxfile.c +++ b/Build/source/texk/dvipdfmx/src/dpxfile.c @@ -726,7 +726,7 @@ if ((l) + (n) >= (m)) { \ } case 'v': /* Version number, e.g. 1.4 */ { char buf[6]; - sprintf(buf, "1.%hu", version); + sprintf(buf, "1.%hu", (unsigned short) version); need(cmd, n, size, strlen(buf)); strcpy(cmd + n, buf); n += strlen(buf); break; diff --git a/Build/source/texk/dvipdfmx/src/pdfobj.c b/Build/source/texk/dvipdfmx/src/pdfobj.c index cb8145f3e84..22f02e06e26 100644 --- a/Build/source/texk/dvipdfmx/src/pdfobj.c +++ b/Build/source/texk/dvipdfmx/src/pdfobj.c @@ -2960,7 +2960,7 @@ pdf_open (const char *ident, FILE *file) new_version = pdf_deref_obj(pdf_lookup_dict(pf->catalog, "Version")); if (new_version) { - unsigned char minor; + unsigned short minor; if (!PDF_OBJ_NAMETYPE(new_version) || sscanf(pdf_name_value(new_version), "1.%hu", &minor) != 1) { @@ -3003,7 +3003,7 @@ pdf_files_close (void) static int check_for_pdf_version (FILE *file) { - unsigned char minor; + unsigned short minor; rewind(file); diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL index f83f51da748..98eb3594ddc 100644 --- a/Build/source/texk/xdvipdfmx/ChangeLog.TL +++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL @@ -1,6 +1,11 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx ================================================= +2010-06-08 Peter Breitenlohner <peb@mppmu.mpg.de> + + * src/dpxfile.c (dpx_file_apply_filter) [Solaris9]: + Avoid "%hhu", use "%hu" and (unsigned short) version. + 2010-03-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Remove AC_TYPE_SIZE_T, now part of KPSE_COMMON. diff --git a/Build/source/texk/xdvipdfmx/src/dpxfile.c b/Build/source/texk/xdvipdfmx/src/dpxfile.c index 09e7c4df6cc..8e89f207911 100644 --- a/Build/source/texk/xdvipdfmx/src/dpxfile.c +++ b/Build/source/texk/xdvipdfmx/src/dpxfile.c @@ -749,7 +749,7 @@ if ((l) + (n) >= (m)) { \ } case 'v': /* Version number, e.g. 1.4 */ { char buf[6]; - sprintf(buf, "1.%hhu", version); + sprintf(buf, "1.%hu", (unsigned short) version); need(cmd, n, size, strlen(buf)); strcpy(cmd + n, buf); n += strlen(buf); break; |