~mdw
/
sgt
/
halibut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revamp of the Halibut error handling mechanism.
[sgt/halibut]
/
in_pf.c
diff --git
a/in_pf.c
b/in_pf.c
index
8f7a4ac
..
2814445
100644
(file)
--- a/
in_pf.c
+++ b/
in_pf.c
@@
-177,7
+177,7
@@
static void pf_identify(t1_font *tf) {
c = pf_getc(pf);
if (c == EOF) {
sfree(rsc.text);
c = pf_getc(pf);
if (c == EOF) {
sfree(rsc.text);
- err
or(err_pfeof,
&tf->pos);
+ err
_pfeof(
&tf->pos);
return;
}
rdaddc(&rsc, c);
return;
}
rdaddc(&rsc, c);
@@
-185,7
+185,7
@@
static void pf_identify(t1_font *tf) {
p = rsc.text;
if ((p = strchr(p, ':')) == NULL) {
sfree(rsc.text);
p = rsc.text;
if ((p = strchr(p, ':')) == NULL) {
sfree(rsc.text);
- err
or(err_pfhead,
&tf->pos);
+ err
_pfhead(
&tf->pos);
return;
}
p++;
return;
}
p++;
@@
-204,7
+204,7
@@
static void pf_identify(t1_font *tf) {
return;
}
}
return;
}
}
- err
or(err_pfnoafm,
&tf->pos, fontname);
+ err
_pfnoafm(
&tf->pos, fontname);
sfree(fontname);
}
sfree(fontname);
}
@@
-252,7
+252,7
@@
static size_t pf_length1(t1_font *tf) {
ret = pf_findtoken(tf, 0, "eexec");
if (ret == (size_t)-1) {
ret = pf_findtoken(tf, 0, "eexec");
if (ret == (size_t)-1) {
- err
or(err_pfeof,
&tf->pos);
+ err
_pfeof(
&tf->pos);
return 0;
}
return ret;
return 0;
}
return ret;
@@
-265,7
+265,7
@@
static size_t pf_length2(t1_font *tf) {
tf->length1 = pf_length1(tf);
ret = pf_findtoken(tf, tf->length1, "cleartomark");
if (ret == (size_t)-1) {
tf->length1 = pf_length1(tf);
ret = pf_findtoken(tf, tf->length1, "cleartomark");
if (ret == (size_t)-1) {
- err
or(err_pfeof,
&tf->pos);
+ err
_pfeof(
&tf->pos);
return 0;
}
return ret - 12 - tf->length1; /* backspace over "cleartomark\n" */
return 0;
}
return ret - 12 - tf->length1; /* backspace over "cleartomark\n" */