summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-01 09:16:53 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-01 09:16:53 +0000
commit5f3e957d96ea7892cf414c7a8857af53f30bd50f (patch)
tree9a6228844fc01e5392dd8a9379ea0fb68922717f
parent5d07f14f1a5a1b5c3b8e9a3673da1c8630ccbaa5 (diff)
still more writet1.c tweaks
git-svn-id: svn://tug.org/texlive/trunk@20626 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipsk/ChangeLog4
-rw-r--r--Build/source/texk/dvipsk/writet1.c8
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/pdftexdir/writet1.c15
4 files changed, 12 insertions, 20 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 448b7d104cc..f15f9772a05 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * writet1.c: Still more tweaks.
+
2010-11-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* writet1.c: Further reduce diffs against pdftex's writet1.c.
diff --git a/Build/source/texk/dvipsk/writet1.c b/Build/source/texk/dvipsk/writet1.c
index c77d79fc679..206c6db6279 100644
--- a/Build/source/texk/dvipsk/writet1.c
+++ b/Build/source/texk/dvipsk/writet1.c
@@ -333,14 +333,12 @@ char **load_enc_file(char *enc_name)
int i, names_count;
char **glyph_names;
set_cur_file_name(enc_name);
+ if (!enc_open()) {
+ pdftex_fail("cannot open encoding file for reading");
+ }
glyph_names = (char **) mymalloc(256 * sizeof(char *));
for (i = 0; i < 256; i++)
glyph_names[i] = (char *) notdef;
- if (!enc_open()) {
- pdftex_warn("cannot open encoding file for reading");
- cur_file_name = NULL;
- return glyph_names;
- }
t1_log("{");
t1_log(cur_file_name = full_file_name());
enc_getline();
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index a4a398b05e4..157c274834a 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-01 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * writet1.c: Drop unreachable code (after pdftex_fail).
+ Drop unused free_glyph_names() function.
+
2010-11-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* writet1.c (t1_check_unusual_charstring): Drop unused variable.
diff --git a/Build/source/texk/web2c/pdftexdir/writet1.c b/Build/source/texk/web2c/pdftexdir/writet1.c
index f583c409bb9..9e13e09de21 100644
--- a/Build/source/texk/web2c/pdftexdir/writet1.c
+++ b/Build/source/texk/web2c/pdftexdir/writet1.c
@@ -237,8 +237,6 @@ char **load_enc_file(char *enc_name)
set_cur_file_name(enc_name);
if (!enc_open()) {
pdftex_fail("cannot open encoding file for reading");
- cur_file_name = NULL;
- return NULL;
}
glyph_names = xtalloc(256, char *);
for (i = 0; i < 256; i++)
@@ -285,18 +283,6 @@ char **load_enc_file(char *enc_name)
return glyph_names;
}
-#if 0 /* unused */
-static void free_glyph_names(char **glyph_names)
-{
- int i;
- assert(glyph_names != NULL);
- for (i = 0; i < 256; i++)
- if (glyph_names[i] != notdef)
- xfree(glyph_names[i]);
- xfree(glyph_names);
-}
-#endif
-
static void t1_check_pfa(void)
{
const int c = t1_getchar();
@@ -916,7 +902,6 @@ static boolean t1_open_fontfile(const char *open_name_prefix)
} else {
set_cur_file_name(fd_cur->fm->ff_name);
pdftex_fail("cannot open Type 1 font file for reading");
- return false;
}
t1_init_params(open_name_prefix);
return true; /* font file found */