mirrors
/
nnn
mirror of https://github.com/jarun/nnn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix lint error

This commit is contained in:
Arun Prakash Jana 2019-03-01 07:22:32 +05:30
parent 51fbd42ac0
commit 11b317020d
No known key found for this signature in database
GPG Key ID: A75979F35C080412
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/nnn.c
View File

@ -3380,6 +3380,7 @@ nochange:
{ {
if (ndents) if (ndents)
mkpath(path, dents[cur].name, newpath); mkpath(path, dents[cur].name, newpath);
r = TRUE;
switch (sel) { switch (sel) {
case SEL_MEDIA: case SEL_MEDIA:
@ -3409,10 +3410,8 @@ nochange:
case SEL_RUNEDIT: case SEL_RUNEDIT:
if (!quote_run_sh_cmd(editor, dents[cur].name, path)) if (!quote_run_sh_cmd(editor, dents[cur].name, path))
goto nochange; goto nochange;
r = TRUE;
break; break;
case SEL_RUNPAGE: case SEL_RUNPAGE:
r = TRUE;
spawn(pager, pager_arg, dents[cur].name, path, F_NORMAL); spawn(pager, pager_arg, dents[cur].name, path, F_NORMAL);
break; break;
case SEL_NOTE: case SEL_NOTE:
@ -3427,11 +3426,9 @@ nochange:
if (!quote_run_sh_cmd(editor, notepath, NULL)) if (!quote_run_sh_cmd(editor, notepath, NULL))
goto nochange; goto nochange;
r = TRUE;
break; break;
} }
default: /* SEL_LOCK */ default: /* SEL_LOCK */
r = TRUE;
spawn(utils[LOCKER], NULL, NULL, NULL, F_NORMAL | F_SIGINT); spawn(utils[LOCKER], NULL, NULL, NULL, F_NORMAL | F_SIGINT);
break; break;
} }
@ -3510,7 +3507,6 @@ nochange:
copystartid = cur; copystartid = cur;
ncp = 0; ncp = 0;
printmsg("selection on"); printmsg("selection on");
DPRINTF_S("selection on");
goto nochange; goto nochange;
} }
@ -3531,10 +3527,8 @@ nochange:
} // fallthrough } // fallthrough
case SEL_COPYALL: case SEL_COPYALL:
if (sel == SEL_COPYALL) { if (sel == SEL_COPYALL) {
if (!ndents) { if (!ndents)
printmsg("0 entries");
goto nochange; goto nochange;
}
cfg.copymode = 0; cfg.copymode = 0;
copybufpos = 0; copybufpos = 0;
@ -3576,7 +3570,8 @@ nochange:
if (!cpsafe()) if (!cpsafe())
goto nochange; goto nochange;
if (sel == SEL_CP) { switch (sel) {
case SEL_CP:
snprintf(g_buf, CMD_LEN_MAX, snprintf(g_buf, CMD_LEN_MAX,
#ifdef __linux__ #ifdef __linux__
"xargs -0 -a %s -%c src %s src .", "xargs -0 -a %s -%c src %s src .",
@ -3585,7 +3580,8 @@ nochange:
"cat %s | xargs -0 -o -%c src cp -iRp src .", "cat %s | xargs -0 -o -%c src cp -iRp src .",
g_cppath, REPLACE_STR); g_cppath, REPLACE_STR);
#endif #endif
} else if (sel == SEL_MV) { break;
case SEL_MV:
snprintf(g_buf, CMD_LEN_MAX, snprintf(g_buf, CMD_LEN_MAX,
#ifdef __linux__ #ifdef __linux__
"xargs -0 -a %s -%c src %s src .", "xargs -0 -a %s -%c src %s src .",
@ -3594,7 +3590,8 @@ nochange:
"cat %s | xargs -0 -o -%c src mv -i src .", "cat %s | xargs -0 -o -%c src mv -i src .",
g_cppath, REPLACE_STR); g_cppath, REPLACE_STR);
#endif #endif
} else { /* SEL_RMMUL */ break;
default: /* SEL_RMMUL */
snprintf(g_buf, CMD_LEN_MAX, snprintf(g_buf, CMD_LEN_MAX,
#ifdef __linux__ #ifdef __linux__
"xargs -0 -a %s rm -%cr", "xargs -0 -a %s rm -%cr",
@ -3602,6 +3599,7 @@ nochange:
"cat %s | xargs -0 -o rm -%cr", "cat %s | xargs -0 -o rm -%cr",
#endif #endif
g_cppath, confirm_force()); g_cppath, confirm_force());
break;
} }
spawn("sh", "-c", g_buf, path, F_NORMAL | F_SIGINT); spawn("sh", "-c", g_buf, path, F_NORMAL | F_SIGINT);
@ -3964,10 +3962,8 @@ nochange:
} // fallthrough } // fallthrough
case SEL_QUITCTX: case SEL_QUITCTX:
if (sel == SEL_QUITCTX) { if (sel == SEL_QUITCTX) {
uint iter = 1;
r = cfg.curctx; r = cfg.curctx;
while (iter < CTX_MAX) { for (fd = 1; fd < CTX_MAX; ++fd) {
(r == CTX_MAX - 1) ? (r = 0) : ++r; (r == CTX_MAX - 1) ? (r = 0) : ++r;
if (g_ctx[r].c_cfg.ctxactive) { if (g_ctx[r].c_cfg.ctxactive) {
g_ctx[cfg.curctx].c_cfg.ctxactive = 0; g_ctx[cfg.curctx].c_cfg.ctxactive = 0;
@ -3982,8 +3978,6 @@ nochange:
setdirwatch(); setdirwatch();
goto begin; goto begin;
} }
++iter;
} }
} }