diff options
Diffstat (limited to 'src/mail.c')
-rw-r--r-- | src/mail.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -282,34 +282,34 @@ mail_send_message (mu_address_t rcpt, const char *text, mu_stream_unref (stream); if (rc) { logmsg (LOG_CRIT, _("cannot create message: %s"), mu_strerror (rc)); return; } mu_message_get_header (msg, &hdr); mu_header_append (hdr, "X-Mailer", x_mailer); if (rcpt) { mu_address_to_string (rcpt, NULL, 0, &size); - buf = xmalloc (size + 1); + buf = grecs_malloc (size + 1); mu_address_to_string (rcpt, buf, size + 1, NULL); mu_header_set_value (hdr, "To", buf, 1); free (buf); if (from_address && mu_header_sget_value (hdr, "From", &sval)) { mu_address_to_string (from_address, NULL, 0, &size); - buf = xmalloc (size + 1); + buf = grecs_malloc (size + 1); mu_address_to_string (from_address, buf, size + 1, NULL); mu_header_set_value (hdr, "From", buf, 1); free (buf); } } if (debug_level > 1) { mu_debug_level_t level; mu_debug_get_category_level (MU_DEBCAT_MAILER, &level); level |= MU_DEBUG_LEVEL_MASK (MU_DEBUG_TRACE0) | @@ -425,35 +425,35 @@ mail_stats () if (!admin_address) { logmsg (LOG_ERR, _("cannot mail statistics: admin-address not defined")); return; } if (debug_level) { size_t size; char *buf; mu_address_to_string (admin_address, NULL, 0, &size); - buf = xmalloc (size + 1); + buf = grecs_malloc (size + 1); mu_address_to_string (admin_address, buf, size + 1, NULL); logmsg (LOG_DEBUG, _("sending stats to %s"), buf); free (buf); } tc = timer_get_count () * 3; exp = make_stat_expansion (tc + 1); time (&t); exp[0].kw = "date"; - exp[0].value = exp[0].storage = xstrdup (ctime (&t)); + exp[0].value = exp[0].storage = grecs_strdup (ctime (&t)); exp[0].value [strlen (exp[0].value) - 1] = 0; timer_fill_meta (exp + 1, tc); tmpl = resolve_message_template (admin_stat_message); if (!tmpl) { logmsg (LOG_ERR, _("undefined message reference: %s"), admin_stat_message); return; } text = meta_expand_string (tmpl, exp, NULL, NULL, NULL); @@ -589,25 +589,25 @@ do_notify (struct file_triplet *trp, enum notification_event ev, trp->project, notification_event_str (ev), gettext (errp)); return; } if (debug_level) { if (rcpt) { size_t size; char *buf; mu_address_to_string (rcpt, NULL, 0, &size); - buf = xmalloc (size + 1); + buf = grecs_malloc (size + 1); mu_address_to_string (rcpt, buf, size + 1, NULL); logmsg (LOG_DEBUG, _("notifying %s (project %s) about %s"), buf, trp->project, notification_event_str (ev)); free (buf); } else logmsg (LOG_DEBUG, _("notifying message recipients (project %s) about %s"), trp->project, notification_event_str (ev)); } msg = resolve_message_template (ntf->msg); @@ -633,25 +633,25 @@ notify (struct notification *notification_list, if (p->ev == ev) do_notify (trp, ev, p); /* FIXME */ } const char * expand_email_admin (struct metadef *def, void *data) { size_t size; if (mu_address_to_string (admin_address, NULL, 0, &size) == 0) { size++; - def->storage = xmalloc (size); + def->storage = grecs_malloc (size); mu_address_to_string (admin_address, def->storage, size, NULL); def->value = def->storage; } else def->value = ""; return def->value; } const char * expand_email_owner (struct metadef *def, void *data) { struct file_triplet *trp = data; @@ -661,22 +661,22 @@ expand_email_owner (struct metadef *def, void *data) addr = get_recipient (trp->spool->dictionary[project_owner_dict], trp, &errp); if (!addr) { logmsg (LOG_ERR, _("cannot get email of the %s's owner: %s"), trp->project, gettext (errp)); def->value = ""; } else if (mu_address_to_string (addr, NULL, 0, &size) == 0) { size++; - def->storage = xmalloc (size); + def->storage = grecs_malloc (size); mu_address_to_string (addr, def->storage, size, NULL); def->value = def->storage; mu_address_destroy (&addr); } else def->value = ""; return def->value; } |