summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-08-14 07:56:01 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-08-14 07:56:01 +0000
commit2140a977d75a70d4d2771fbd985de7b7e04eeced (patch)
treee59830df28895d3f1badb1c0b23a968d1960a762 /Build
parentffeeafa35eed495470a73eb4f0f7ddbd316dfc7a (diff)
texk/dvipdfm-x: More static functions
git-svn-id: svn://tug.org/texlive/trunk@38121 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/dvipdfm-x/ChangeLog11
-rw-r--r--Build/source/texk/dvipdfm-x/cff.c2
-rw-r--r--Build/source/texk/dvipdfm-x/cff.h3
-rw-r--r--Build/source/texk/dvipdfm-x/cid.c8
-rw-r--r--Build/source/texk/dvipdfm-x/cid.h5
-rw-r--r--Build/source/texk/dvipdfm-x/cmap.c2
-rw-r--r--Build/source/texk/dvipdfm-x/cmap.h1
-rw-r--r--Build/source/texk/dvipdfm-x/cmap_write.h3
8 files changed, 20 insertions, 15 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index b0816b55d80..3de0ba85b2f 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,14 @@
+2015-08-14 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * cff.[ch]: Declare cff_match_string() as static.
+ * cff.h: Drop unused '#define cff_is_stdstr(s)'.
+
+ * cid.[ch]: Declare CIDFont_new(), CIDFont_release(),
+ CIDFont_flush(), and CIDFont_cache_init() as static.
+
+ * cmap.[ch]: Declare CMap_match_codespace() as static.
+ * cmap_write.h: Put '#if 0...#endif' around Map_ToCode_stream().
+
2015-08-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* agl.[ch]: Declare agl_load_listfile() as static.
diff --git a/Build/source/texk/dvipdfm-x/cff.c b/Build/source/texk/dvipdfm-x/cff.c
index f134f44d9f2..b17ad647be6 100644
--- a/Build/source/texk/dvipdfm-x/cff.c
+++ b/Build/source/texk/dvipdfm-x/cff.c
@@ -545,7 +545,7 @@ long cff_get_seac_sid (cff_font *cff, const char *str)
return -1;
}
-int cff_match_string (cff_font *cff, const char *str, s_SID sid)
+static int cff_match_string (cff_font *cff, const char *str, s_SID sid)
{
card16 i;
diff --git a/Build/source/texk/dvipdfm-x/cff.h b/Build/source/texk/dvipdfm-x/cff.h
index 4339d02ab85..bd9458c8d57 100644
--- a/Build/source/texk/dvipdfm-x/cff.h
+++ b/Build/source/texk/dvipdfm-x/cff.h
@@ -140,13 +140,10 @@ extern long cff_read_fdarray (cff_font *cff);
extern long cff_read_private (cff_font *cff);
/* String */
-extern int cff_match_string (cff_font *cff, const char *str, s_SID sid);
extern char *cff_get_string (cff_font *cff, s_SID id);
extern long cff_get_sid (cff_font *cff, const char *str);
extern long cff_get_seac_sid (cff_font *cff, const char *str);
extern s_SID cff_add_string (cff_font *cff, const char *str, int unique);
extern void cff_update_string (cff_font *cff);
-#define cff_is_stdstr(s) (cff_get_sid(NULL, (s)) >= 0)
-
#endif /* _CFF_H_ */
diff --git a/Build/source/texk/dvipdfm-x/cid.c b/Build/source/texk/dvipdfm-x/cid.c
index 07d60c29ce1..e918277f17f 100644
--- a/Build/source/texk/dvipdfm-x/cid.c
+++ b/Build/source/texk/dvipdfm-x/cid.c
@@ -127,7 +127,7 @@ CIDFont_require_version (void)
}
#endif
-CIDFont *
+static CIDFont *
CIDFont_new (void)
{
CIDFont *font = NULL;
@@ -159,7 +159,7 @@ CIDFont_new (void)
}
/* It does write PDF objects. */
-void
+static void
CIDFont_flush (CIDFont *font)
{
if (font) {
@@ -172,7 +172,7 @@ CIDFont_flush (CIDFont *font)
}
}
-void
+static void
CIDFont_release (CIDFont *font)
{
if (font) {
@@ -522,7 +522,7 @@ static struct FontCache *__cache = NULL;
ERROR("%s: Invalid ID %d", CIDFONT_DEBUG_STR, (n));\
} while (0)
-void
+static void
CIDFont_cache_init (void)
{
if (__cache)
diff --git a/Build/source/texk/dvipdfm-x/cid.h b/Build/source/texk/dvipdfm-x/cid.h
index 79b18749071..4267e232ec4 100644
--- a/Build/source/texk/dvipdfm-x/cid.h
+++ b/Build/source/texk/dvipdfm-x/cid.h
@@ -53,10 +53,6 @@ extern void CIDFont_set_flags (long flags);
#define CIDFONT_FLAG_TYPE1C (1 << 9)
#define CIDFONT_FLAG_TRUETYPE (1 << 10)
-extern CIDFont *CIDFont_new (void);
-extern void CIDFont_release (CIDFont *font);
-extern void CIDFont_flush (CIDFont *font);
-
extern char *CIDFont_get_fontname (CIDFont *font);
extern char *CIDFont_get_ident (CIDFont *font); /* FIXME */
@@ -77,7 +73,6 @@ extern int CIDFont_is_ACCFont (CIDFont *font);
extern int CIDFont_is_UCSFont (CIDFont *font);
#include "fontmap.h"
-extern void CIDFont_cache_init (void);
extern int CIDFont_cache_find (const char *map_name, CIDSysInfo *cmap_csi, fontmap_opt *fmap_opt);
extern CIDFont *CIDFont_cache_get (int fnt_id);
extern void CIDFont_cache_close (void);
diff --git a/Build/source/texk/dvipdfm-x/cmap.c b/Build/source/texk/dvipdfm-x/cmap.c
index d5c909cda01..fa8a72258ca 100644
--- a/Build/source/texk/dvipdfm-x/cmap.c
+++ b/Build/source/texk/dvipdfm-x/cmap.c
@@ -495,7 +495,7 @@ CMap_set_usecmap (CMap *cmap, CMap *ucmap)
}
/* Test the validity of character c. */
-int
+static int
CMap_match_codespace (CMap *cmap, const unsigned char *c, int dim)
{
int i, pos;
diff --git a/Build/source/texk/dvipdfm-x/cmap.h b/Build/source/texk/dvipdfm-x/cmap.h
index 75c39bd4b47..677516595ba 100644
--- a/Build/source/texk/dvipdfm-x/cmap.h
+++ b/Build/source/texk/dvipdfm-x/cmap.h
@@ -97,7 +97,6 @@ extern int CMap_add_notdefrange (CMap *cmap,
extern int CMap_add_codespacerange (CMap *cmap,
const unsigned char *codelo, const unsigned char *codehi, int dim);
-extern int CMap_match_codespace (CMap *cmap, const unsigned char *c, int dim);
extern void CMap_decode_char (CMap *cmap,
const unsigned char **inbuf, long *inbytesleft,
diff --git a/Build/source/texk/dvipdfm-x/cmap_write.h b/Build/source/texk/dvipdfm-x/cmap_write.h
index 933c0b6f652..00888027ce6 100644
--- a/Build/source/texk/dvipdfm-x/cmap_write.h
+++ b/Build/source/texk/dvipdfm-x/cmap_write.h
@@ -26,8 +26,11 @@
#include "cmap.h"
extern pdf_obj *CMap_create_stream (CMap *cmap);
+#if 0
+/* Not completed yet */
extern pdf_obj *CMap_ToCode_stream (CMap *cmap, const char *cmap_name,
CIDSysInfo *csi, int cmap_type,
unsigned char *used_slot, int flags);
+#endif /* 0 */
#endif /* _CMAP_WRITE_H_ */