summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/omegafonts
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/omegafonts')
-rw-r--r--Build/source/texk/web2c/omegafonts/ChangeLog5
-rw-r--r--Build/source/texk/web2c/omegafonts/omfonts.c12
-rw-r--r--Build/source/texk/web2c/omegafonts/omfonts.h2
3 files changed, 12 insertions, 7 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index a653b2aeca1..623d6cb2d06 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * omfonts.[ch] (read_in_whole, name_ofm, name_opl, name_ovp,
+ name_ovf, files): Declare file names as const_string.
+
2010-01-12 Peter Breitenlohner <peb@mppmu.mpg.de>
* char_routines.c (compute_ofm_character_info): Fix CHARREPEAT.
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c
index d2a9d8b0288..5a6ec0a6c4e 100644
--- a/Build/source/texk/web2c/omegafonts/omfonts.c
+++ b/Build/source/texk/web2c/omegafonts/omfonts.c
@@ -56,10 +56,10 @@ int text_format = TEXT_CODE_MIXED;
int program;
-string name_ofm = NULL;
-string name_opl = NULL;
-string name_ovp = NULL;
-string name_ovf = NULL;
+const_string name_ofm = NULL;
+const_string name_opl = NULL;
+const_string name_ovp = NULL;
+const_string name_ovf = NULL;
FILE *file_ofm = NULL;
FILE *file_opl = NULL;
@@ -98,7 +98,7 @@ static const_string names_msg[PROG_NUM] = {
};
int no_files=0;
-string *files[3] = {NULL, NULL, NULL};
+const_string *files[3] = {NULL, NULL, NULL};
const_string suffixes[3] = {NULL, NULL, NULL};
const_string full_suffixes[3] = {NULL, NULL, NULL};
@@ -321,7 +321,7 @@ void
read_in_whole(unsigned char **contents_loc,
unsigned *length_loc,
FILE *file,
- string name)
+ const_string name)
{
unsigned no_read;
unsigned no_total_read = 0;
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.h b/Build/source/texk/web2c/omegafonts/omfonts.h
index 79516146e60..006915e3aaa 100644
--- a/Build/source/texk/web2c/omegafonts/omfonts.h
+++ b/Build/source/texk/web2c/omegafonts/omfonts.h
@@ -43,7 +43,7 @@ extern unsigned char *ofm;
extern unsigned char *ovf;
extern int main(int, string *);
-extern void read_in_whole(unsigned char **, unsigned *, FILE *, string );
+extern void read_in_whole(unsigned char **, unsigned *, FILE *, const_string );
extern void init_tables(void);
extern void output_ovf_file(void);
extern void output_text_file(FILE *);