From 2b209ba9b267f1ac7e0561c13f869b4c86f751ee Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Sat, 18 Apr 2009 14:04:53 +0200
Subject: [PATCH] Moved SF_SMFS in ncdu.h to char calc_smfs in calc.h
Another code cleanup, many more to come...
---
src/calc.c | 5 +++--
src/calc.h | 3 ++-
src/main.c | 3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/calc.c b/src/calc.c
index 32d659d..f08cc24 100644
--- a/src/calc.c
+++ b/src/calc.c
@@ -61,7 +61,8 @@
#endif
-int calc_delay;
+int calc_delay;
+char calc_smfs;
struct {
char err; /* 1/0, error or not */
@@ -223,7 +224,7 @@ int calc_item(struct dir *par, char *path, char *name) {
if(exclude_match(tmp))
d->flags |= FF_EXL;
- if(sflags & SF_SMFS && stcalc.curdev != fs.st_dev)
+ if(calc_smfs && stcalc.curdev != fs.st_dev)
d->flags |= FF_OTHFS;
/* determine type of this item */
diff --git a/src/calc.h b/src/calc.h
index 745b165..1c08c55 100644
--- a/src/calc.h
+++ b/src/calc.h
@@ -28,7 +28,8 @@
#include "ncdu.h"
-extern int calc_delay; /* minimum screen update interval when calculating, in ms */
+extern int calc_delay; /* minimum screen update interval when calculating, in ms */
+extern char calc_smfs; /* stay on the same filesystem */
void calc_process(void);
int calc_key(int);
diff --git a/src/main.c b/src/main.c
index a9ba2dc..97239aa 100644
--- a/src/main.c
+++ b/src/main.c
@@ -81,6 +81,7 @@ void argv_parse(int argc, char **argv, char *dir) {
getcwd(dir, PATH_MAX);
sflags = 0;
calc_delay = 100;
+ calc_smfs = 0;
/* read from commandline */
for(i=1; i<argc; i++) {
@@ -104,7 +105,7 @@ void argv_parse(int argc, char **argv, char *dir) {
len = strlen(argv[i]);
for(j=1; j<len; j++)
switch(argv[i][j]) {
- case 'x': sflags |= SF_SMFS; break;
+ case 'x': calc_smfs = 1; break;
case 'q': calc_delay = 2000; break;
case '?':
case 'h':
--
GitLab