projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
imap
/
imap.c
diff --git
a/imap/imap.c
b/imap/imap.c
index
2a4feca
..
44d3eee
100644
(file)
--- a/
imap/imap.c
+++ b/
imap/imap.c
@@
-1184,7
+1184,7
@@
int imap_mailbox_check (char *path, int new)
if (m_strcmp(mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
if (m_strcmp(mbox_unquoted, idata->mailbox) == 0
|| (ascii_strcasecmp (mbox_unquoted, "INBOX") == 0
- &&
str_casecmp
(mbox_unquoted, idata->mailbox) == 0)) {
+ &&
m_strcasecmp
(mbox_unquoted, idata->mailbox) == 0)) {
strfcpy (buf, "NOOP", sizeof (buf));
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
strfcpy (buf, "NOOP", sizeof (buf));
}
else if (mutt_bit_isset (idata->capabilities, IMAP4REV1) ||
@@
-1209,8
+1209,8
@@
int imap_mailbox_check (char *path, int new)
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
/* The mailbox name may or may not be quoted here. We could try to
* munge the server response and compare with quoted (or vise versa)
* but it is probably more efficient to just strncmp against both. */
- if (
str_ncmp
(mbox_unquoted, s, m_strlen(mbox_unquoted)) == 0
- ||
str_ncmp
(mbox, s, m_strlen(mbox)) == 0) {
+ if (
m_strncmp
(mbox_unquoted, s, m_strlen(mbox_unquoted)) == 0
+ ||
m_strncmp
(mbox, s, m_strlen(mbox)) == 0) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
s = imap_next_word (s);
s = imap_next_word (s);
if (isdigit ((unsigned char) *s)) {
@@
-1514,7
+1514,7
@@
static int imap_complete_hosts (char *dest, size_t len) {
return (-1);
for (i = 0; i < Incoming->length; i++) {
mailbox = (BUFFY*) Incoming->data[i];
return (-1);
for (i = 0; i < Incoming->length; i++) {
mailbox = (BUFFY*) Incoming->data[i];
- if (!
str_ncmp
(dest, mailbox->path, matchlen)) {
+ if (!
m_strncmp
(dest, mailbox->path, matchlen)) {
if (rc) {
strfcpy (dest, mailbox->path, len);
rc = 0;
if (rc) {
strfcpy (dest, mailbox->path, len);
rc = 0;
@@
-1535,7
+1535,7
@@
static int imap_complete_hosts (char *dest, size_t len) {
url.user = NULL;
url.path = NULL;
url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
url.user = NULL;
url.path = NULL;
url_ciss_tostring (&url, urlstr, sizeof (urlstr), 0);
- if (!
str_ncmp
(dest, urlstr, matchlen)) {
+ if (!
m_strncmp
(dest, urlstr, matchlen)) {
if (rc) {
strfcpy (dest, urlstr, len);
rc = 0;
if (rc) {
strfcpy (dest, urlstr, len);
rc = 0;