Commit 16a6c59c 16a6c59c10ebafa0004a6d6d9ad0561a5cfc1a11 by Sergey Poznyakoff

Replace munre_ with mu_unre_

1 parent a8c60d45
......@@ -121,8 +121,8 @@ extern char *mu_strcasestr (const char *haystack, const char *needle);
extern int mu_string_unfold (char *text, size_t *plen);
extern int munre_set_regex (char *str, int caseflag, char **errp);
extern int munre_subject (const char *subject, const char **new_subject);
extern int mu_unre_set_regex (char *str, int caseflag, char **errp);
extern int mu_unre_subject (const char *subject, const char **new_subject);
extern char *mu_charset_lookup (char *lang, char *terr);
......
......@@ -389,7 +389,7 @@ vacation_subject (mu_sieve_machine_t mach, mu_list_t tags,
{
char *err = NULL;
rc = munre_set_regex (arg->v.string, 0, &err);
rc = mu_unre_set_regex (arg->v.string, 0, &err);
if (rc)
{
mu_sieve_error (mach,
......@@ -400,7 +400,7 @@ vacation_subject (mu_sieve_machine_t mach, mu_list_t tags,
}
}
if (munre_subject (subject, NULL))
if (mu_unre_subject (subject, NULL))
re_subject (mach, tags, &subject);
free (value);
......
......@@ -57,7 +57,7 @@ mail_followup (int argc, char **argv)
{
char *p = NULL;
if (munre_subject (str, NULL))
if (mu_unre_subject (str, NULL))
util_strcat (&p, util_reply_prefix ());
util_strcat (&p, str);
free (str);
......
......@@ -99,7 +99,7 @@ reply0 (msgset_t *mspec, mu_message_t msg, void *data)
{
char *p = NULL;
if (munre_subject (str, NULL))
if (mu_unre_subject (str, NULL))
util_strcat (&p, util_reply_prefix ());
util_strcat (&p, str);
free (str);
......
......@@ -667,7 +667,7 @@ util_setenv (const char *variable, void *value, mail_env_data_t type,
int rc;
char *err;
if ((rc = munre_set_regex (value, 0, &err)))
if ((rc = mu_unre_set_regex (value, 0, &err)))
{
fprintf (stderr, "%s", mu_strerror (rc));
if (err)
......
......@@ -31,7 +31,7 @@
static regex_t *re_prefix;
int
munre_set_regex (char *str, int caseflag, char **errp)
mu_unre_set_regex (char *str, int caseflag, char **errp)
{
int rc;
int flags = REG_EXTENDED;
......@@ -70,7 +70,7 @@ munre_set_regex (char *str, int caseflag, char **errp)
}
int
munre_subject (const char *subject, const char **new_subject)
mu_unre_subject (const char *subject, const char **new_subject)
{
int rc;
regmatch_t rm;
......@@ -80,7 +80,7 @@ munre_subject (const char *subject, const char **new_subject)
if (!re_prefix)
{
rc = munre_set_regex (NULL, 0, NULL);
rc = mu_unre_set_regex (NULL, 0, NULL);
if (rc)
return rc;
}
......
......@@ -1791,7 +1791,7 @@ static void
builtin_unre (struct mh_machine *mach)
{
const char *p;
int rc = munre_subject (strobj_ptr (&mach->arg_str), &p);
int rc = mu_unre_subject (strobj_ptr (&mach->arg_str), &p);
if (rc == 0 && p != strobj_ptr (&mach->arg_str))
{
char *q = strdup (p); /* Create a copy, since strobj_create will
......@@ -1814,11 +1814,11 @@ builtin_isreply (struct mh_machine *mach)
mu_message_get_header (mach->message, &hdr);
mu_header_aget_value (hdr, MU_HEADER_SUBJECT, &value);
rc = munre_subject (value, NULL);
rc = mu_unre_subject (value, NULL);
free (value);
}
else
rc = munre_subject (strobj_ptr (&mach->arg_str), NULL);
rc = mu_unre_subject (strobj_ptr (&mach->arg_str), NULL);
mach->arg_num = !rc;
}
......
......@@ -786,7 +786,7 @@ void
mh_set_reply_regex (const char *str)
{
char *err;
int rc = munre_set_regex (str, 0, &err);
int rc = mu_unre_set_regex (str, 0, &err);
if (rc)
mh_error ("reply_regex: %s%s%s", mu_strerror (rc),
err ? ": " : "",
......