summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/pdfdraw.c4
-rw-r--r--apps/pdfinfo.c4
-rw-r--r--fitz/filt_dctd.c2
-rw-r--r--fitz/fitz_base.h7
-rw-r--r--fitz/res_font.c2
-rw-r--r--mupdf/pdf_cmap_parse.c6
-rw-r--r--mupdf/pdf_colorspace1.c2
-rw-r--r--mupdf/pdf_font.c6
-rw-r--r--mupdf/pdf_fontagl.c2
-rw-r--r--mupdf/pdf_open.c8
-rw-r--r--mupdf/pdf_type3.c2
11 files changed, 19 insertions, 26 deletions
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index a3ef1291..6f658fa9 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -355,7 +355,7 @@ static void drawpages(char *pagelist)
drawtimes.min = LONG_MAX;
}
- spec = strsep(&pagelist, ",");
+ spec = fz_strsep(&pagelist, ",");
while (spec)
{
dash = strchr(spec, '-');
@@ -392,7 +392,7 @@ static void drawpages(char *pagelist)
}
}
- spec = strsep(&pagelist, ",");
+ spec = fz_strsep(&pagelist, ",");
}
if (benchmark)
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index 73ed6148..145f0592 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -979,7 +979,7 @@ showinfo(char *filename, int show, char *pagelist)
allpages = !strcmp(pagelist, "1-");
- spec = strsep(&pagelist, ",");
+ spec = fz_strsep(&pagelist, ",");
while (spec)
{
dash = strchr(spec, '-');
@@ -1023,7 +1023,7 @@ showinfo(char *filename, int show, char *pagelist)
}
}
- spec = strsep(&pagelist, ",");
+ spec = fz_strsep(&pagelist, ",");
}
if (allpages)
diff --git a/fitz/filt_dctd.c b/fitz/filt_dctd.c
index 3018218a..b10a321e 100644
--- a/fitz/filt_dctd.c
+++ b/fitz/filt_dctd.c
@@ -17,7 +17,7 @@ static void myerrexit(j_common_ptr cinfo)
struct myerrmgr *err = (struct myerrmgr *)cinfo->err;
char msgbuf[JMSG_LENGTH_MAX];
err->super.format_message(cinfo, msgbuf);
- strlcpy(err->msg, msgbuf, sizeof err->msg);
+ fz_strlcpy(err->msg, msgbuf, sizeof err->msg);
longjmp(err->jb, 1);
}
diff --git a/fitz/fitz_base.h b/fitz/fitz_base.h
index 52a93f0c..6e6bc294 100644
--- a/fitz/fitz_base.h
+++ b/fitz/fitz_base.h
@@ -39,13 +39,6 @@ extern char *fz_strsep(char **stringp, const char *delim);
extern int fz_strlcpy(char *dst, const char *src, int n);
extern int fz_strlcat(char *dst, const char *src, int n);
-#undef strsep
-#define strsep fz_strsep
-#undef strlcpy
-#define strlcpy fz_strlcpy
-#undef strlcat
-#define strlcat fz_strlcat
-
extern int fz_getopt(int nargc, char * const * nargv, const char *ostr);
extern int fz_opterr, fz_optind, fz_optopt;
extern char *fz_optarg;
diff --git a/fitz/res_font.c b/fitz/res_font.c
index ea8eec98..f56a1ac8 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -342,7 +342,7 @@ fz_newtype3font(char *name, fz_matrix matrix)
font->t3procs = fz_malloc(sizeof(fz_buffer*) * 256);
font->t3widths = fz_malloc(sizeof(float) * 256);
- strlcpy(font->name, name, sizeof(font->name));
+ fz_strlcpy(font->name, name, sizeof(font->name));
font->t3matrix = matrix;
for (i = 0; i < 256; i++)
{
diff --git a/mupdf/pdf_cmap_parse.c b/mupdf/pdf_cmap_parse.c
index 60367626..4be074ee 100644
--- a/mupdf/pdf_cmap_parse.c
+++ b/mupdf/pdf_cmap_parse.c
@@ -71,7 +71,7 @@ static fz_error parsecmapname(pdf_cmap *cmap, fz_stream *file)
if (tok == PDF_TNAME)
{
- strlcpy(cmap->cmapname, buf, sizeof(cmap->cmapname));
+ fz_strlcpy(cmap->cmapname, buf, sizeof(cmap->cmapname));
return fz_okay;
}
@@ -407,12 +407,12 @@ pdf_parsecmap(pdf_cmap **cmapp, fz_stream *file)
}
}
else
- strlcpy(key, buf, sizeof key);
+ fz_strlcpy(key, buf, sizeof key);
}
else if (tok == TUSECMAP)
{
- strlcpy(cmap->usecmapname, key, sizeof(cmap->usecmapname));
+ fz_strlcpy(cmap->usecmapname, key, sizeof(cmap->usecmapname));
}
else if (tok == TBEGINCODESPACERANGE)
diff --git a/mupdf/pdf_colorspace1.c b/mupdf/pdf_colorspace1.c
index b6038afe..536805b4 100644
--- a/mupdf/pdf_colorspace1.c
+++ b/mupdf/pdf_colorspace1.c
@@ -8,7 +8,7 @@ static void initcs(fz_colorspace *cs, char *name, int n,
void(*from)(fz_colorspace*,float*,float*),
void(*freefunc)(fz_colorspace*))
{
- strlcpy(cs->name, name, sizeof cs->name);
+ fz_strlcpy(cs->name, name, sizeof cs->name);
cs->refs = 1;
cs->convpixmap = pdf_convpixmap;
cs->convcolor = pdf_convcolor;
diff --git a/mupdf/pdf_font.c b/mupdf/pdf_font.c
index 04ac6665..f81b0a98 100644
--- a/mupdf/pdf_font.c
+++ b/mupdf/pdf_font.c
@@ -585,15 +585,15 @@ loadcidfont(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *dict, fz_obj *enco
tmplen = MIN(sizeof tmpstr - 1, fz_tostrlen(obj));
memcpy(tmpstr, fz_tostrbuf(obj), tmplen);
tmpstr[tmplen] = '\0';
- strlcpy(collection, tmpstr, sizeof collection);
+ fz_strlcpy(collection, tmpstr, sizeof collection);
- strlcat(collection, "-", sizeof collection);
+ fz_strlcat(collection, "-", sizeof collection);
obj = fz_dictgets(cidinfo, "Ordering");
tmplen = MIN(sizeof tmpstr - 1, fz_tostrlen(obj));
memcpy(tmpstr, fz_tostrbuf(obj), tmplen);
tmpstr[tmplen] = '\0';
- strlcat(collection, tmpstr, sizeof collection);
+ fz_strlcat(collection, tmpstr, sizeof collection);
}
/*
diff --git a/mupdf/pdf_fontagl.c b/mupdf/pdf_fontagl.c
index 09a1bb2c..852223f2 100644
--- a/mupdf/pdf_fontagl.c
+++ b/mupdf/pdf_fontagl.c
@@ -5070,7 +5070,7 @@ int pdf_lookupagl(char *name)
int l = 0;
int r = nelem(aglcodes) - 1;
- strlcpy(buf, name, sizeof buf);
+ fz_strlcpy(buf, name, sizeof buf);
/* kill anything after first period and underscore */
p = strchr(buf, '.');
diff --git a/mupdf/pdf_open.c b/mupdf/pdf_open.c
index ba8e7434..693b1d7f 100644
--- a/mupdf/pdf_open.c
+++ b/mupdf/pdf_open.c
@@ -105,10 +105,10 @@ readoldtrailer(pdf_xref *xref, char *buf, int cap)
return fz_rethrow(error, "cannot read xref count");
s = buf;
- ofs = atoi(strsep(&s, " "));
+ ofs = atoi(fz_strsep(&s, " "));
if (!s)
return fz_throw("invalid range marker in xref");
- len = atoi(strsep(&s, " "));
+ len = atoi(fz_strsep(&s, " "));
/* broken pdfs where the section is not on a separate line */
if (s && *s != '\0')
@@ -234,8 +234,8 @@ readoldxref(fz_obj **trailerp, pdf_xref *xref, char *buf, int cap)
return fz_rethrow(error, "cannot read xref count");
s = buf;
- ofs = atoi(strsep(&s, " "));
- len = atoi(strsep(&s, " "));
+ ofs = atoi(fz_strsep(&s, " "));
+ len = atoi(fz_strsep(&s, " "));
/* broken pdfs where the section is not on a separate line */
if (s && *s != '\0')
diff --git a/mupdf/pdf_type3.c b/mupdf/pdf_type3.c
index 550a37a2..cfee4c4b 100644
--- a/mupdf/pdf_type3.c
+++ b/mupdf/pdf_type3.c
@@ -19,7 +19,7 @@ pdf_loadtype3font(pdf_fontdesc **fontdescp, pdf_xref *xref, fz_obj *rdb, fz_obj
obj = fz_dictgets(dict, "Name");
if (fz_isname(obj))
- strlcpy(buf, fz_toname(obj), sizeof buf);
+ fz_strlcpy(buf, fz_toname(obj), sizeof buf);
else
sprintf(buf, "Unnamed-T3");
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 11:57:17 +0000