return 0;
}
-static const char *folder_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)
+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;
time_t tnow;
- FOLDER *folder = (FOLDER *) data;
+ FOLDER *folder = data.ptr;
struct passwd *pw;
struct group *gr;
int optional = (flags & M_FORMAT_OPTIONAL);
break;
}
- if (optional)
- m_strformat (dest, destlen, ifstring, folder_format_str, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- m_strformat (dest, destlen, elsestring, 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
-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)
+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 = (FOLDER *) data;
+ FOLDER *folder = data.ptr;
switch (op) {
case 'C':
case 's':
if (flags & M_FORMAT_OPTIONAL) {
if (folder->ff->nd->unread != 0)
- m_strformat (dest, destlen, ifstring, newsgroup_format_str,
- data, flags);
+ m_strformat(dest, destlen, 0, ifstr, newsgroup_format_str,
+ data, flags);
else
- m_strformat (dest, destlen, elsestring, 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);
#ifdef USE_NNTP
if (option (OPTNEWS))
- m_strformat (s, slen, NONULL (GroupFormat), newsgroup_format_str,
- (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, &folder,
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
else
#endif
- m_strformat (s, slen, NONULL (FolderFormat), folder_format_str,
- (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
+ m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, &folder,
+ option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
static void init_menu (struct browser_state *state, MUTTMENU * menu,