pdfTeX: Fixed typos and minor glitches

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

6 files changed, 15 insertions, 5 deletions

diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 3ec9312e705..91a955edd95 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.web: Change type of pdf_ptr: longinteger => integer.
+	* pdftex-common.h: Change type of pdfptr accordingly.
+
+2011-12-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* utils.c (getfiledump): Drop `off_t' cast from arg2 of fseek().
+	* ttf2afm.c, writettf.c: Typo in comment.
+
 2011-12-12  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* writejbig2.h (removed): Declarations moved ...
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex-common.h b/Build/source/texk/web2c/pdftexdir/pdftex-common.h
index 4b21eaac315..fb8823256ca 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex-common.h
+++ b/Build/source/texk/web2c/pdftexdir/pdftex-common.h
@@ -39,7 +39,7 @@ extern integer pdfboxspectrim;
 extern integer pdfboxspecart;
 
 extern longinteger pdfstreamlength;
-extern longinteger pdfptr;
+extern integer pdfptr;
 extern integer poolptr;
 extern eightbits *pdfbuf;
 extern integer pdfbufsize;
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index f08f4ffbe7e..96d2455012d 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -15192,7 +15192,7 @@ end
 @!pdf_file: byte_file; {the PDF output file}
 @!pdf_buf: ^eight_bits; {pointer to the PDF output buffer or PDF object stream buffer}
 @!pdf_buf_size: integer; {end of PDF output buffer or PDF object stream buffer}
-@!pdf_ptr: longinteger; {pointer to the first unused byte in the PDF buffer or object stream buffer}
+@!pdf_ptr: integer; {pointer to the first unused byte in the PDF buffer or object stream buffer}
 @!pdf_op_buf: ^eight_bits; {the PDF output buffer}
 @!pdf_os_buf: ^eight_bits; {the PDF object stream buffer}
 @!pdf_os_buf_size: integer; {current size of the PDF object stream buffer, grows dynamically}
diff --git a/Build/source/texk/web2c/pdftexdir/ttf2afm.c b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
index fbd8015f938..1da6acde57c 100644
--- a/Build/source/texk/web2c/pdftexdir/ttf2afm.c
+++ b/Build/source/texk/web2c/pdftexdir/ttf2afm.c
@@ -346,7 +346,7 @@ static void read_cmap(void)
     TTF_USHORT *glyphId, format, segCount;
     long int n, i, k, length, index;
     int unicode_map_count = 0;
-    ttf_seek_tab("cmap", TTF_USHORT_SIZE);      /* skip the table vesrion number (=0) */
+    ttf_seek_tab("cmap", TTF_USHORT_SIZE);      /* skip the table version number (=0) */
     ncmapsubtabs = get_ushort();
     cmap_offset = xftell(fontfile, cur_file_name) - 2 * TTF_USHORT_SIZE;
     cmap_tab = xtalloc(ncmapsubtabs, cmap_entry);
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index c8845029217..d98de0bc7a9 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -1077,7 +1077,7 @@ void getfiledump(strnumber s, int offset, int length)
         return;
     }
     recorder_record_input(file_name);
-    if (fseek(f, (off_t) offset, SEEK_SET) != 0) {
+    if (fseek(f, offset, SEEK_SET) != 0) {
         xfree(file_name);
         return;
     }
diff --git a/Build/source/texk/web2c/pdftexdir/writettf.c b/Build/source/texk/web2c/pdftexdir/writettf.c
index c723c79191e..1d5cd6497dc 100644
--- a/Build/source/texk/web2c/pdftexdir/writettf.c
+++ b/Build/source/texk/web2c/pdftexdir/writettf.c
@@ -580,7 +580,7 @@ static ttf_cmap_entry *ttf_read_cmap(char *ttf_name, int pid, int eid,
         return p;
 
     /* not found, have to read it */
-    ttf_seek_tab("cmap", TTF_USHORT_SIZE);      /* skip the table vesrion number (=0) */
+    ttf_seek_tab("cmap", TTF_USHORT_SIZE);      /* skip the table version number (=0) */
     ncmapsubtabs = get_ushort();
     cmap_offset = xftell(INFILE, cur_file_name) - 2 * TTF_USHORT_SIZE;
     cmap_tab = xtalloc(ncmapsubtabs, cmap_entry);