projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
let m_strformat accept NULL formats.
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
fd92753
..
b135b33
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-147,14
+147,14
@@
static int link_is_dir (const char *folder, const char *path)
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
const char *src, const char *fmt,
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
const char *src, const char *fmt,
- const char *ifstr
ing
,
- const char *els
estring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr,
+ const char *els
tr
,
+
anytype
data, format_flag flags)
{
char fn[STRING], tmp[STRING], permission[11], date[16];
const char *t_fmt;
time_t tnow;
{
char fn[STRING], tmp[STRING], permission[11], date[16];
const char *t_fmt;
time_t tnow;
- FOLDER *folder =
(FOLDER *) data
;
+ FOLDER *folder =
data.ptr
;
struct passwd *pw;
struct group *gr;
int optional = (flags & M_FORMAT_OPTIONAL);
struct passwd *pw;
struct group *gr;
int optional = (flags & M_FORMAT_OPTIONAL);
@@
-300,24
+300,23
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
break;
}
break;
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0);
- return (src);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, optional ? ifstr : elstr, folder_format_str,
+ data, 0);
+
+ return src;
}
#ifdef USE_NNTP
static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
const char *src, const char *fmt,
}
#ifdef USE_NNTP
static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
const char *src, const char *fmt,
- const char *ifstring,
- const char *elsestring,
- unsigned long data,
- format_flag flags)
+ const char *ifstr,
+ const char *elstr,
+ anytype data, format_flag flags)
{
char fn[STRING], tmp[STRING];
{
char fn[STRING], tmp[STRING];
- FOLDER *folder =
(FOLDER *) data
;
+ FOLDER *folder =
data.ptr
;
switch (op) {
case 'C':
switch (op) {
case 'C':
@@
-350,10
+349,10
@@
static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
- m
utt_FormatString (dest, destlen, ifstring
, newsgroup_format_str,
+ m
_strformat (dest, destlen, ifstr
, newsgroup_format_str,
data, flags);
else
data, flags);
else
- m
utt_FormatString (dest, destlen, elsestring
, newsgroup_format_str,
+ m
_strformat (dest, destlen, elstr
, newsgroup_format_str,
data, flags);
}
else if (Context && Context->data == folder->ff->nd) {
data, flags);
}
else if (Context && Context->data == folder->ff->nd) {
@@
-645,12
+644,12
@@
static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
#ifdef USE_NNTP
if (option (OPTNEWS))
#ifdef USE_NNTP
if (option (OPTNEWS))
- m
utt_FormatString (s, slen, NONULL (GroupFormat), newsgroup_format_st
r,
-
(unsigned long) &folder, M_FORMAT_ARROWCURSOR
);
+ m
_strformat(s, slen, GroupFormat, newsgroup_format_str, &folde
r,
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
else
#endif
else
#endif
- m
utt_FormatString (s, slen, NONULL (FolderFormat), folder_format_st
r,
-
(unsigned long) &folder, M_FORMAT_ARROWCURSOR
);
+ m
_strformat(s, slen, FolderFormat, folder_format_str, &folde
r,
+
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0
);
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,