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]
/
pop
/
pop_auth.c
diff --git
a/pop/pop_auth.c
b/pop/pop_auth.c
index
c7b62a9
..
2e8bd21
100644
(file)
--- a/
pop/pop_auth.c
+++ b/
pop/pop_auth.c
@@
-11,14
+11,15
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "mutt.h"
-#include "ascii.h"
#include "mx.h"
#include "md5.h"
#include "pop.h"
#include "mx.h"
#include "md5.h"
#include "pop.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
#include "lib/debug.h"
#include <string.h>
#include "lib/debug.h"
#include <string.h>
@@
-125,7
+126,7
@@
static pop_auth_res_t pop_auth_sasl (POP_DATA * pop_data, const char *method)
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
#ifndef USE_SASL
/* sasl_client_st(art|ep) allocate pc with malloc, expect me to
* free it */
#ifndef USE_SASL
-
mem_free
(&pc);
+
p_delete
(&pc);
#endif
}
}
#endif
}
}
@@
-161,11
+162,11
@@
void pop_apop_timestamp (POP_DATA * pop_data, char *buf)
{
char *p1, *p2;
{
char *p1, *p2;
-
mem_free
(&pop_data->timestamp);
+
p_delete
(&pop_data->timestamp);
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
if ((p1 = strchr (buf, '<')) && (p2 = strchr (p1, '>'))) {
p2[1] = '\0';
- pop_data->timestamp =
str_dup
(p1);
+ pop_data->timestamp =
m_strdup
(p1);
}
}
}
}
@@
-304,7
+305,7
@@
pop_query_status pop_authenticate (POP_DATA * pop_data)
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
if (PopAuthenticators && *PopAuthenticators) {
/* Try user-specified list of authentication methods */
- methods =
str_dup
(PopAuthenticators);
+ methods =
m_strdup
(PopAuthenticators);
method = methods;
while (method) {
method = methods;
while (method) {
@@
-343,7
+344,7
@@
pop_query_status pop_authenticate (POP_DATA * pop_data)
method = comma;
}
method = comma;
}
-
mem_free
(&methods);
+
p_delete
(&methods);
}
else {
/* Fall back to default: any authenticator */
}
else {
/* Fall back to default: any authenticator */