projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops, d can be NULL !
[apps/madmutt.git]
/
browser.c
diff --git
a/browser.c
b/browser.c
index
f8fbb3d
..
2cc3341
100644
(file)
--- a/
browser.c
+++ b/
browser.c
@@
-145,11
+145,11
@@
static int link_is_dir (const char *folder, const char *path)
return 0;
}
return 0;
}
-static const char *
folder_format_str (char *dest, ssize_t destlen, char op,
-
const char *src, const char *fmt
,
-
const char *ifstr
,
-
const char *elstr,
-
anytype data, format_flag flags)
+static const char *
+
folder_format_str(char *dest, ssize_t destlen, char op
,
+
const char *src, const char *fmt
,
+
const char *ifstr,
const char *elstr,
+ anytype data, format_flag flags)
{
char fn[STRING], tmp[STRING], permission[11], date[16];
const char *t_fmt;
{
char fn[STRING], tmp[STRING], permission[11], date[16];
const char *t_fmt;
@@
-300,20
+300,20
@@
static const char *folder_format_str (char *dest, ssize_t destlen, char op,
break;
}
break;
}
- if (optional)
- m_strformat (dest, destlen, ifstr, folder_format_str, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- m_strformat (dest, destlen, elstr, folder_format_str, data, 0);
- return (src);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ folder_format_str, data, 0);
+
+ return src;
}
#ifdef USE_NNTP
}
#ifdef USE_NNTP
-static const char *
newsgroup_format_str (char *dest, ssize_t destlen, char op,
-
const char *src, const char *fmt
,
-
const char *ifstr
,
-
const char *elstr,
-
anytype data, format_flag flags)
+static const char *
+
newsgroup_format_str(char *dest, ssize_t destlen, char op
,
+
const char *src, const char *fmt
,
+
const char *ifstr,
const char *elstr,
+ anytype data, format_flag flags)
{
char fn[STRING], tmp[STRING];
FOLDER *folder = data.ptr;
{
char fn[STRING], tmp[STRING];
FOLDER *folder = data.ptr;
@@
-349,11
+349,11
@@
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_strformat
(dest, destlen
, ifstr, newsgroup_format_str,
-
data, flags);
+ m_strformat
(dest, destlen, 0
, ifstr, newsgroup_format_str,
+ data, flags);
else
else
- m_strformat (dest, destlen, elstr, newsgroup_format_str,
-
data, flags);
+ m_strformat (dest, destlen,
0,
elstr, newsgroup_format_str,
+ data, flags);
}
else if (Context && Context->data == folder->ff->nd) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
}
else if (Context && Context->data == folder->ff->nd) {
snprintf (tmp, sizeof (tmp), "%%%sd", fmt);
@@
-644,13
+644,11
@@
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_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
- (void*)&folder,
+ m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folder,
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
else
#endif
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
else
#endif
- m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
- (void *)&folder,
+ m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folder,
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}