From d57e79e599d9450218d6784acaa2bc0a674d57c1 Mon Sep 17 00:00:00 2001 From: Pierre Habouzit Date: Mon, 18 Dec 2006 19:40:44 +0100 Subject: [PATCH] simplifications Signed-off-by: Pierre Habouzit --- browser.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/browser.c b/browser.c index 2cc3341..fba0ac3 100644 --- a/browser.c +++ b/browser.c @@ -65,9 +65,9 @@ static void destroy_state (struct browser_state *state) int c; for (c = 0; c < state->entrylen; c++) { - p_delete(&((state->entry)[c].name)); - p_delete(&((state->entry)[c].desc)); - p_delete(&((state->entry)[c].st)); + p_delete(&state->entry[c].name); + p_delete(&state->entry[c].desc); + p_delete(&state->entry[c].st); } p_delete(&state->folder); p_delete(&state->entry); @@ -184,9 +184,9 @@ folder_format_str(char *dest, ssize_t destlen, char op, const char *s; if (folder->ff->imap) - s = NONULL (folder->ff->desc); + s = NONULL(folder->ff->desc); else - s = NONULL (folder->ff->name); + s = NONULL(folder->ff->name); snprintf (fn, sizeof (fn), "%s%s", s, folder->ff->st ? (S_ISLNK (folder->ff->st->st_mode) ? "@" : @@ -200,9 +200,8 @@ folder_format_str(char *dest, ssize_t destlen, char op, case 'F': if (folder->ff->st != NULL) { snprintf (permission, sizeof (permission), "%c%c%c%c%c%c%c%c%c%c", - S_ISDIR (folder->ff->st-> - st_mode) ? 'd' : (S_ISLNK (folder->ff->st-> - st_mode) ? 'l' : '-'), + S_ISDIR(folder->ff->st-> st_mode) + ? 'd' : (S_ISLNK(folder->ff->st-> st_mode) ? 'l' : '-'), (folder->ff->st->st_mode & S_IRUSR) != 0 ? 'r' : '-', (folder->ff->st->st_mode & S_IWUSR) != 0 ? 'w' : '-', (folder->ff->st->st_mode & S_ISUID) != @@ -465,11 +464,7 @@ static int examine_directory (MUTTMENU * menu, struct browser_state *state, continue; if (!((regexec (Mask.rx, data->group, 0, NULL, 0) == 0) ^ Mask.not)) continue; -#ifdef USE_NNTP add_folder (menu, state, data->group, NULL, data, data->new); -#else - add_folder (menu, state, data->group, NULL, data->new); -#endif } sidebar_draw (); } -- 2.20.1