mirror of
https://github.com/jarun/nnn.git
synced 2024-11-24 20:01:27 +00:00
Change order of switch cases (1)
This commit is contained in:
parent
55f1397cbb
commit
b15867143c
94
src/nnn.c
94
src/nnn.c
|
@ -2913,6 +2913,13 @@ nochange:
|
|||
if (ndents)
|
||||
copycurname();
|
||||
goto nochange;
|
||||
case SEL_MFLTR: // fallthrough
|
||||
case SEL_TOGGLEDOT: // fallthrough
|
||||
case SEL_DETAIL: // fallthrough
|
||||
case SEL_FSIZE: // fallthrough
|
||||
case SEL_BSIZE: // fallthrough
|
||||
case SEL_MTIME:
|
||||
switch (sel) {
|
||||
case SEL_MFLTR:
|
||||
cfg.filtermode ^= 1;
|
||||
if (cfg.filtermode) {
|
||||
|
@ -2920,22 +2927,49 @@ nochange:
|
|||
goto nochange;
|
||||
}
|
||||
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
|
||||
dir_changed = TRUE;
|
||||
/* Start watching the directory */
|
||||
goto begin;
|
||||
dir_changed = TRUE;
|
||||
break;
|
||||
case SEL_TOGGLEDOT:
|
||||
cfg.showhidden ^= 1;
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
goto begin;
|
||||
break;
|
||||
case SEL_DETAIL:
|
||||
cfg.showdetail ^= 1;
|
||||
cfg.showdetail ? (printptr = &printent_long) : (printptr = &printent);
|
||||
break;
|
||||
case SEL_FSIZE:
|
||||
cfg.sizeorder ^= 1;
|
||||
cfg.mtimeorder = 0;
|
||||
cfg.apparentsz = 0;
|
||||
cfg.blkorder = 0;
|
||||
cfg.copymode = 0;
|
||||
break;
|
||||
case SEL_BSIZE:
|
||||
if (sel == SEL_BSIZE) {
|
||||
if (!cfg.apparentsz)
|
||||
cfg.blkorder ^= 1;
|
||||
nftw_fn = &sum_bsizes;
|
||||
cfg.apparentsz = 0;
|
||||
BLK_SHIFT = ffs(S_BLKSIZE) - 1;
|
||||
}
|
||||
|
||||
if (cfg.blkorder) {
|
||||
cfg.showdetail = 1;
|
||||
printptr = &printent_long;
|
||||
}
|
||||
cfg.mtimeorder = 0;
|
||||
cfg.sizeorder = 0;
|
||||
cfg.copymode = 0;
|
||||
break;
|
||||
default: /* SEL_MTIME */
|
||||
cfg.mtimeorder ^= 1;
|
||||
cfg.sizeorder = 0;
|
||||
cfg.apparentsz = 0;
|
||||
cfg.blkorder = 0;
|
||||
cfg.copymode = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
|
@ -3020,16 +3054,6 @@ nochange:
|
|||
/* Repopulate as directory content may have changed */
|
||||
goto begin;
|
||||
}
|
||||
case SEL_FSIZE:
|
||||
cfg.sizeorder ^= 1;
|
||||
cfg.mtimeorder = 0;
|
||||
cfg.apparentsz = 0;
|
||||
cfg.blkorder = 0;
|
||||
cfg.copymode = 0;
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
goto begin;
|
||||
case SEL_ASIZE:
|
||||
cfg.apparentsz ^= 1;
|
||||
if (cfg.apparentsz) {
|
||||
|
@ -3038,36 +3062,6 @@ nochange:
|
|||
BLK_SHIFT = 0;
|
||||
} else
|
||||
cfg.blkorder = 0; // fallthrough
|
||||
case SEL_BSIZE:
|
||||
if (sel == SEL_BSIZE) {
|
||||
if (!cfg.apparentsz)
|
||||
cfg.blkorder ^= 1;
|
||||
nftw_fn = &sum_bsizes;
|
||||
cfg.apparentsz = 0;
|
||||
BLK_SHIFT = ffs(S_BLKSIZE) - 1;
|
||||
}
|
||||
|
||||
if (cfg.blkorder) {
|
||||
cfg.showdetail = 1;
|
||||
printptr = &printent_long;
|
||||
}
|
||||
cfg.mtimeorder = 0;
|
||||
cfg.sizeorder = 0;
|
||||
cfg.copymode = 0;
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
goto begin;
|
||||
case SEL_MTIME:
|
||||
cfg.mtimeorder ^= 1;
|
||||
cfg.sizeorder = 0;
|
||||
cfg.apparentsz = 0;
|
||||
cfg.blkorder = 0;
|
||||
cfg.copymode = 0;
|
||||
/* Save current */
|
||||
if (ndents)
|
||||
copycurname();
|
||||
goto begin;
|
||||
case SEL_COPY:
|
||||
if (!ndents)
|
||||
goto nochange;
|
||||
|
|
Loading…
Reference in a new issue