projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimizations, remove horrors.
[apps/madmutt.git]
/
lib-crypt
/
pgpkey.c
diff --git
a/lib-crypt/pgpkey.c
b/lib-crypt/pgpkey.c
index
033c0e8
..
b1ded7c
100644
(file)
--- a/
lib-crypt/pgpkey.c
+++ b/
lib-crypt/pgpkey.c
@@
-99,8
+99,8
@@
typedef struct pgp_entry {
static const char *
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
static const char *
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
- const char *ifstr
ing, const char *elsestring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr
, const char *elstr
,
+
anytype
data, format_flag flags)
{
char fmt[16];
pgp_entry_t *entry;
{
char fmt[16];
pgp_entry_t *entry;
@@
-109,7
+109,7
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
int kflags = 0;
int optional = (flags & M_FORMAT_OPTIONAL);
int kflags = 0;
int optional = (flags & M_FORMAT_OPTIONAL);
- entry =
(pgp_entry_t *) data
;
+ entry =
data.ptr
;
uid = entry->uid;
key = uid->parent;
pkey = pgp_principal_key (key);
uid = entry->uid;
key = uid->parent;
pkey = pgp_principal_key (key);
@@
-125,7
+125,7
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
{
const char *cp;
{
const char *cp;
- char buf2[S
HORT_S
TRING], *p;
+ char buf2[STRING], *p;
int do_locales;
struct tm *tm;
ssize_t len;
int do_locales;
struct tm *tm;
ssize_t len;
@@
-236,9
+236,9
@@
pgp_entry_fmt (char *dest, ssize_t destlen, char op,
}
if (optional)
}
if (optional)
- m
utt_FormatString (dest, destlen, ifstring
, mutt_attach_fmt, data, 0);
+ m
_strformat (dest, destlen, ifstr
, mutt_attach_fmt, data, 0);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- m
utt_FormatString (dest, destlen, elsestring
, mutt_attach_fmt, data, 0);
+ m
_strformat (dest, destlen, elstr
, mutt_attach_fmt, data, 0);
return (src);
}
return (src);
}
@@
-250,8
+250,9
@@
static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
entry.uid = KeyTable[num];
entry.num = num + 1;
entry.uid = KeyTable[num];
entry.num = num + 1;
- mutt_FormatString (s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
- (unsigned long) &entry, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
+ (void*)&entry,
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static int _pgp_compare_address (const void *a, const void *b)
}
static int _pgp_compare_address (const void *a, const void *b)
@@
-406,7
+407,7
@@
static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
pgp_uid_t **KeyTable;
MUTTMENU *menu;
int i, done = 0;
pgp_uid_t **KeyTable;
MUTTMENU *menu;
int i, done = 0;
- char helpstr[S
HORT_S
TRING], buf[LONG_STRING], tmpbuf[STRING];
+ char helpstr[STRING], buf[LONG_STRING], tmpbuf[STRING];
char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
FILE *fp, *devnull;
pid_t thepid;
char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
FILE *fp, *devnull;
pid_t thepid;
@@
-617,7
+618,7
@@
pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
short abilities, pgp_ring_t keyring)
{
pgp_key_t key;
short abilities, pgp_ring_t keyring)
{
pgp_key_t key;
- char resp[S
HORT_S
TRING];
+ char resp[STRING];
struct pgp_cache *l = NULL;
mutt_clear_error ();
struct pgp_cache *l = NULL;
mutt_clear_error ();