summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-01-21 00:05:04 +0000
committerKarl Berry <karl@freefriends.org>2007-01-21 00:05:04 +0000
commit04ab0df1a2504108d23d9cb11345a8a95b9e0966 (patch)
tree1184363883eaf75d9bc7abf011cb6ff4ed86d4b8 /Build/source
parentc1e2445b9ef34d7956f991f39f28d5d840ed4626 (diff)
fixes from ChoF and Olaf
git-svn-id: svn://tug.org/texlive/trunk@3647 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/dvipdfmx/src/fontmap.c2
-rw-r--r--Build/source/texk/dvipdfmx/src/spc_html.c1
-rw-r--r--Build/source/texk/dvipdfmx/src/specials.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/Build/source/texk/dvipdfmx/src/fontmap.c b/Build/source/texk/dvipdfmx/src/fontmap.c
index 4d321438c0d..fc2d894f3ab 100644
--- a/Build/source/texk/dvipdfmx/src/fontmap.c
+++ b/Build/source/texk/dvipdfmx/src/fontmap.c
@@ -422,7 +422,7 @@ fontmap_parse_mapdef (fontmap_rec *mrec,
if (v < 0 || v > 16)
WARN("Invalid valur for option 'p': %s", q);
else {
- mrec->opt.mapc |= v << 16;
+ mrec->opt.mapc = v << 16;
}
RELEASE(q);
break;
diff --git a/Build/source/texk/dvipdfmx/src/spc_html.c b/Build/source/texk/dvipdfmx/src/spc_html.c
index fc9ad80bcc0..912839179d1 100644
--- a/Build/source/texk/dvipdfmx/src/spc_html.c
+++ b/Build/source/texk/dvipdfmx/src/spc_html.c
@@ -288,6 +288,7 @@ fqurl (const char *baseurl, const char *name)
len += strlen(baseurl) + 1; /* we may want to add '/' */
q = NEW(len + 1, char);
+ *q = '\0';
if (baseurl && baseurl[0]) {
char *p;
strcpy(q, baseurl);
diff --git a/Build/source/texk/dvipdfmx/src/specials.h b/Build/source/texk/dvipdfmx/src/specials.h
index a52570ae31d..2be14952ea9 100644
--- a/Build/source/texk/dvipdfmx/src/specials.h
+++ b/Build/source/texk/dvipdfmx/src/specials.h
@@ -44,7 +44,7 @@ typedef int (*spc_handler_fn_ptr) (struct spc_env *, struct spc_arg *);
struct spc_handler {
const char *key;
spc_handler_fn_ptr exec;
-} spc_handler;
+};
/* This should not use pdf_. */
extern void spc_set_verbose (void);