else if (!(*pb)->env->real_subj)
rc = 1;
else
- rc = str_casecmp ((*pa)->env->real_subj, (*pb)->env->real_subj);
+ rc = m_strcasecmp((*pa)->env->real_subj, (*pb)->env->real_subj);
AUXSORT (rc, a, b);
return (SORTCODE (rc));
}
-const char *mutt_get_name (ADDRESS * a)
+const char *mutt_get_name (address_t * a)
{
- ADDRESS *ali;
+ address_t *ali;
const char *name = "";
if (a) {
* On the next call that pointer may get smashed so we copy the return value
* to our own memory space. */
- strncpy (fa, mutt_get_name ((*ppa)->env->to), sizeof (fa));
- fa[sizeof (fa) - 1] = '\0';
+ m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->to));
+ m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->to));
- strncpy (fb, mutt_get_name ((*ppb)->env->to), sizeof (fb));
- fb[sizeof (fb) - 1] = '\0';
-
- result = str_casecmp (fa, fb);
+ result = m_strcasecmp(fa, fb);
AUXSORT (result, a, b);
return (SORTCODE (result));
}
* On the next call that pointer may get smashed so we copy the return value
* to our own memory space. */
- strncpy (fa, mutt_get_name ((*ppa)->env->from), sizeof (fa));
- fa[sizeof (fa) - 1] = '\0';
-
- strncpy (fb, mutt_get_name ((*ppb)->env->from), sizeof (fb));
- fb[sizeof (fb) - 1] = '\0';
+ m_strcpy(fa, sizeof(fa), mutt_get_name((*ppa)->env->from));
+ m_strcpy(fb, sizeof(fb), mutt_get_name((*ppb)->env->from));
- result = str_casecmp (fa, fb);
+ result = m_strcasecmp(fa, fb);
AUXSORT (result, a, b);
return (SORTCODE (result));
}