projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use m_strdup and m_strlen that are inlined for efficiency
[apps/madmutt.git]
/
mutt_ssl.c
diff --git
a/mutt_ssl.c
b/mutt_ssl.c
index
37e46b6
..
804183c
100644
(file)
--- a/
mutt_ssl.c
+++ b/
mutt_ssl.c
@@
-18,11
+18,11
@@
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/err.h>
#include <openssl/rand.h>
-#undef _
-
#include <string.h>
#include <lib-lib/mem.h>
#include <string.h>
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
#include "mutt_socket.h"
#include "mutt.h"
#include "mutt_socket.h"
@@
-30,8
+30,6
@@
#include "mutt_curses.h"
#include "mutt_ssl.h"
#include "mutt_curses.h"
#include "mutt_ssl.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#if OPENSSL_VERSION_NUMBER >= 0x00904000L
#include "lib/debug.h"
#if OPENSSL_VERSION_NUMBER >= 0x00904000L
@@
-418,7
+416,7
@@
static char *x509_get_part (char *line, const char *ndx)
c = strstr (line, ndx);
if (c) {
c = strstr (line, ndx);
if (c) {
- c +=
str_len
(ndx);
+ c +=
m_strlen
(ndx);
c2 = strchr (c, '/');
if (c2)
*c2 = '\0';
c2 = strchr (c, '/');
if (c2)
*c2 = '\0';