mirrors/nnn
1
0
Fork 0
mirror of https://github.com/jarun/nnn.git synced 2024-11-28 05:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant variables/assignments

Browse source
This commit is contained in:
Arun Prakash Jana 2020-01-21 23:09:05 +05:30
parent 8df6602fac
commit 8d6f766e75
No known key found for this signature in database
GPG key ID: A75979F35C080412
1 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/nnn.c
View file

@ -463,17 +463,19 @@ static char * const utils[] = {
#define MSG_EMPTY_FILE 25 #define MSG_EMPTY_FILE 25
#define MSG_UNSUPPORTED 26 #define MSG_UNSUPPORTED 26
#define MSG_NOT_SET 27 #define MSG_NOT_SET 27
#define MSG_DIR_CHANGED 28 #define MSG_EXISTS 28
#define MSG_EXISTS 29 #define MSG_FEW_COLUMNS 29
#define MSG_FEW_COLUMNS 30 #define MSG_REMOTE_OPTS 30
#define MSG_REMOTE_OPTS 31 #define MSG_RCLONE_DELAY 31
#define MSG_RCLONE_DELAY 32 #define MSG_APP_NAME 32
#define MSG_APP_NAME 33 #define MSG_ARCHIVE_OPTS 33
#define MSG_ARCHIVE_OPTS 34 #define MSG_PLUGIN_KEYS 34
#define MSG_PLUGIN_KEYS 35 #define MSG_BOOKMARK_KEYS 35
#define MSG_BOOKMARK_KEYS 36 #define MSG_INVALID_REG 36
#define MSG_INVALID_REG 37 #define MSG_ORDER 37
#define MSG_ORDER 38 #ifndef DIR_LIMITED_SELECTION
#define MSG_DIR_CHANGED 38 /* Must be the last entry */
#endif
static const char * const messages[] = { static const char * const messages[] = {
"no traversal", "no traversal",
@ -504,7 +506,6 @@ static const char * const messages[] = {
"empty: use open with", "empty: use open with",
"unsupported file", "unsupported file",
"not set", "not set",
"dir changed, range sel off",
"entry exists", "entry exists",
"too few columns!", "too few columns!",
"'s'shfs / 'r'clone?", "'s'shfs / 'r'clone?",
@ -515,6 +516,9 @@ static const char * const messages[] = {
"bookmark keys:", "bookmark keys:",
"invalid regex", "invalid regex",
"toggle 'a'u / 'd'u / 'e'xtn / 'r'everse / 's'ize / 't'ime / 'v'ersion?", "toggle 'a'u / 'd'u / 'e'xtn / 'r'everse / 's'ize / 't'ime / 'v'ersion?",
#ifndef DIR_LIMITED_SELECTION
"dir changed, range sel off", /* Must be the last entry */
#endif
}; };
/* Supported configuration environment variables */ /* Supported configuration environment variables */
@ -4512,7 +4516,6 @@ static bool browse(char *ipath, const char *session)
char rundir[PATH_MAX] __attribute__ ((aligned)); char rundir[PATH_MAX] __attribute__ ((aligned));
char runfile[NAME_MAX + 1] __attribute__ ((aligned)); char runfile[NAME_MAX + 1] __attribute__ ((aligned));
char *path, *lastdir, *lastname, *dir, *tmp, *mark = NULL; char *path, *lastdir, *lastname, *dir, *tmp, *mark = NULL;
ino_t inode = 0;
enum action sel; enum action sel;
struct stat sb; struct stat sb;
MEVENT event; MEVENT event;
@ -4520,12 +4523,12 @@ static bool browse(char *ipath, const char *session)
int r = -1, fd, presel, selstartid = 0, selendid = 0; int r = -1, fd, presel, selstartid = 0, selendid = 0;
const uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT)); const uchar opener_flags = (cfg.cliopener ? F_CLI : (F_NOTRACE | F_NOWAIT));
bool currentmouse = 1, dir_changed = FALSE; bool currentmouse = 1, dir_changed = FALSE;
#ifndef DIR_LIMITED_SELECTION
ino_t inode = 0;
#endif
atexit(dentfree); atexit(dentfree);
xlines = LINES;
xcols = COLS;
/* setup first context */ /* setup first context */
if (!session || !load_session(session, &path, &lastdir, &lastname, FALSE)) { if (!session || !load_session(session, &path, &lastdir, &lastname, FALSE)) {
xstrlcpy(g_ctx[0].c_path, ipath, PATH_MAX); /* current directory */ xstrlcpy(g_ctx[0].c_path, ipath, PATH_MAX); /* current directory */
@ -5173,7 +5176,9 @@ nochange:
} }
if (g_states & STATE_RANGESEL) { /* Range selection started */ if (g_states & STATE_RANGESEL) { /* Range selection started */
#ifndef DIR_LIMITED_SELECTION
inode = sb.st_ino; inode = sb.st_ino;
#endif
selstartid = cur; selstartid = cur;
continue; continue;
} }
@ -5867,7 +5872,7 @@ static void cleanup(void)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
mmask_t mask = 0; mmask_t mask;
char *arg = NULL; char *arg = NULL;
char *session = NULL; char *session = NULL;
int opt; int opt;