projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Julien danjou: fix a couple of compilation warnings.
[apps/madmutt.git]
/
gnupgparse.c
diff --git
a/gnupgparse.c
b/gnupgparse.c
index
1f8a0a3
..
cdce751
100644
(file)
--- a/
gnupgparse.c
+++ b/
gnupgparse.c
@@
-33,15
+33,15
@@
#include <time.h>
#include <ctype.h>
#include <time.h>
#include <ctype.h>
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
#include "mutt.h"
#include "pgp.h"
#include "charset.h"
-/* for hexval */
-#include "mime.h"
-
-#include "lib/mem.h"
-#include "lib/str.h"
#include "lib/debug.h"
/****************
#include "lib/debug.h"
/****************
@@
-88,7
+88,7
@@
static void fix_uid (char *uid)
char *ob;
size_t ibl, obl;
char *ob;
size_t ibl, obl;
- buf =
mem_malloc (
n + 1);
+ buf =
p_new(char,
n + 1);
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
my_iconv(cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
my_iconv(cd, &ib, &ibl, &ob, &obl);
if (!ibl) {
@@
-96,10
+96,10
@@
static void fix_uid (char *uid)
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
memcpy (uid, buf, ob - buf);
uid[ob - buf] = '\0';
}
- else if (ob - buf == n && (buf[n] = 0,
str_len
(buf) < n))
+ else if (ob - buf == n && (buf[n] = 0,
m_strlen
(buf) < n))
memcpy (uid, buf, n);
}
memcpy (uid, buf, n);
}
-
mem_free
(&buf);
+
p_delete
(&buf);
iconv_close (cd);
}
}
iconv_close (cd);
}
}
@@
-130,19
+130,19
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
{
debug_print (2, ("record type: %s\n", p));
{
debug_print (2, ("record type: %s\n", p));
- if (!
str_cmp
(p, "pub"));
- else if (!
str_cmp
(p, "sub"))
+ if (!
m_strcmp
(p, "pub"));
+ else if (!
m_strcmp
(p, "sub"))
*is_subkey = 1;
*is_subkey = 1;
- else if (!
str_cmp
(p, "sec"));
- else if (!
str_cmp
(p, "ssb"))
+ else if (!
m_strcmp
(p, "sec"));
+ else if (!
m_strcmp
(p, "ssb"))
*is_subkey = 1;
*is_subkey = 1;
- else if (!
str_cmp
(p, "uid"))
+ else if (!
m_strcmp
(p, "uid"))
is_uid = 1;
else
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
is_uid = 1;
else
return NULL;
if (!(is_uid || (*is_subkey && option (OPTPGPIGNORESUB))))
- k =
mem_calloc (sizeof *k, 1
);
+ k =
pgp_new_keyinfo(
);
break;
}
break;
}
@@
-204,7
+204,7
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
debug_print (2, ("key id: %s\n", p));
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
debug_print (2, ("key id: %s\n", p));
if (!(*is_subkey && option (OPTPGPIGNORESUB)))
-
str_replace
(&k->keyid, p);
+
m_strreplace
(&k->keyid, p);
break;
}
break;
}
@@
-220,7
+220,7
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
time.tm_sec = 0;
time.tm_min = 0;
time.tm_hour = 12;
time.tm_sec = 0;
time.tm_min = 0;
time.tm_hour = 12;
-
strncpy (tstr, p, 11
);
+
m_strcpy(tstr, sizeof(tstr), p
);
tstr[4] = '\0';
time.tm_year = atoi (tstr) - 1900;
tstr[7] = '\0';
tstr[4] = '\0';
time.tm_year = atoi (tstr) - 1900;
tstr[7] = '\0';
@@
-246,9
+246,9
@@
static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
debug_print (2, ("user ID: %s\n", p));
debug_print (2, ("user ID: %s\n", p));
- uid =
mem_calloc (sizeof (pgp_uid_t)
, 1);
+ uid =
p_new(pgp_uid_t
, 1);
fix_uid (p);
fix_uid (p);
- uid->addr =
str_dup
(p);
+ uid->addr =
m_strdup
(p);
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;
uid->trust = trust;
uid->flags |= flags;
uid->parent = k;
@@
-310,7
+310,7
@@
pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
if ((devnull = open ("/dev/null", O_RDWR)) == -1)
return NULL;
-
str_replace
(&_chs, Charset);
+
m_strreplace
(&_chs, Charset);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);
thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
keyring, hints);