projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reindent and optimizations in BUFFER* struct.
[apps/madmutt.git]
/
account.c
diff --git
a/account.c
b/account.c
index
a5b4ff9
..
5270c2e
100644
(file)
--- a/
account.c
+++ b/
account.c
@@
-13,13
+13,16
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt.h"
+#include "enter.h"
#include "account.h"
#include "url.h"
#include "account.h"
#include "url.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
/* mutt_account_match: compare account info (host/port/user/login) */
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
/* mutt_account_match: compare account info (host/port/user/login) */
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
@@
-36,9
+39,9
@@
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
#ifdef USE_IMAP
if (a1->type == M_ACCT_TYPE_IMAP) {
#ifdef USE_IMAP
if (a1->type == M_ACCT_TYPE_IMAP) {
- if (ImapUser)
+ if (ImapUser
&& (ImapUser[0] != '\0')
)
user = ImapUser;
user = ImapUser;
- if (ImapLogin)
+ if (ImapLogin
&& (ImapLogin[0] != '\0')
)
login = ImapLogin;
}
#endif
login = ImapLogin;
}
#endif
@@
-54,11
+57,11
@@
int mutt_account_match (const ACCOUNT * a1, const ACCOUNT * a2)
#endif
if (a1->flags & a2->flags & M_ACCT_USER)
#endif
if (a1->flags & a2->flags & M_ACCT_USER)
- return (!
mutt_str
cmp (a1->user, a2->user));
+ return (!
str_
cmp (a1->user, a2->user));
if (a1->flags & M_ACCT_USER)
if (a1->flags & M_ACCT_USER)
- return (!
mutt_str
cmp (a1->user, user));
+ return (!
str_
cmp (a1->user, user));
if (a2->flags & M_ACCT_USER)
if (a2->flags & M_ACCT_USER)
- return (!
mutt_str
cmp (a2->user, user));
+ return (!
str_
cmp (a2->user, user));
return 1;
}
return 1;
}
@@
-144,7
+147,7
@@
int mutt_account_getuser (ACCOUNT * account)
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
if (account->flags & M_ACCT_USER)
return 0;
#ifdef USE_IMAP
- else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser)
+ else if ((account->type == M_ACCT_TYPE_IMAP) && ImapUser
&& (ImapUser[0] != '\0')
)
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
strfcpy (account->user, ImapUser, sizeof (account->user));
#endif
#ifdef USE_POP
@@
-177,7
+180,7
@@
int mutt_account_getlogin (ACCOUNT* account)
#ifdef USE_IMAP
else if (account->type == M_ACCT_TYPE_IMAP)
{
#ifdef USE_IMAP
else if (account->type == M_ACCT_TYPE_IMAP)
{
- if (ImapLogin) {
+ if (ImapLogin
&& (ImapLogin[0] != '\0')
) {
strfcpy (account->login, ImapLogin, sizeof (account->login));
account->flags |= M_ACCT_LOGIN;
}
strfcpy (account->login, ImapLogin, sizeof (account->login));
account->flags |= M_ACCT_LOGIN;
}