summaryrefslogtreecommitdiffabout
path: root/src/ellinika/elmorph.c
Side-by-side diff
Diffstat (limited to 'src/ellinika/elmorph.c') (more/less context) (ignore whitespace changes)
-rw-r--r--src/ellinika/elmorph.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index 5094db8..ab5dea4 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -129,7 +129,7 @@ _elstr_dup(struct elstr *elstr)
elnew = scm_gc_malloc(sizeof(*elstr), "Elstr");
elnew->str = calloc(elstr->len, sizeof(elnew->str[0]));
if (!elnew->str)
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
memcpy(elnew->str, elstr->str, sizeof(elstr->str[0]) * elstr->len);
elnew->len = elstr->len;
@@ -138,7 +138,7 @@ _elstr_dup(struct elstr *elstr)
sizeof(elnew->phoneme[0]));
if (!elnew->phoneme) {
free(elnew->str);
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
}
memcpy(elnew->phoneme, elstr->phoneme,
sizeof(elstr->phoneme[0]) * elstr->phoneme_count);
@@ -150,7 +150,7 @@ _elstr_dup(struct elstr *elstr)
elnew->sylmap = calloc(elstr->nsyl, sizeof(elnew->sylmap[0]));
if (!elnew->sylmap) {
free(elnew->str);
- scm_memory_error("_elstr_dup");
+ scm_report_out_of_memory();
}
memcpy(elnew->sylmap, elstr->sylmap,
sizeof(elstr->sylmap[0]) * elstr->nsyl);
@@ -173,7 +173,7 @@ _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
wp = realloc(dest->str,
sizeof(dest->str[0]) * (dest->len + src->len));
if (!wp)
- scm_memory_error(func_name);
+ scm_report_out_of_memory();
dest->str = wp;
memcpy(dest->str + dest->len,
src->str,
@@ -181,7 +181,7 @@ _elstr_concat(struct elstr *dest, struct elstr *src, const char *func_name)
dest->len += src->len;
}
-static scm_sizet
+static size_t
_elstr_free(SCM smob)
{
struct elstr *elstr = (struct elstr *) SCM_CDR(smob);
@@ -789,7 +789,7 @@ _elstr_thema_aoristoy(SCM el, int destructive, const char *func_name)
}
}
if (elmorph_thema_aoristoy(elstr->str, elstr->len, &wc, &wclen))
- scm_memory_error(func_name);
+ scm_report_out_of_memory();
free(elstr->str);
elstr->str = wc;
elstr->len = wclen;

Return to:

Send suggestions and report system problems to the System administrator.