Skip to content

Commit 1024a5e

Browse files
jmalakPerditionC
authored andcommitted
cleanup code to be more transparent
doesn't use static symbol name in prototype or parameter name, it is confusing
1 parent 4b4e451 commit 1024a5e

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

cmd/mkdir.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include "../include/misc.h"
1515
#include "../include/lfnfuncs.h"
1616

17-
int recursive_mkdir(const char * path, int optRecursiveMode, int optQuiet)
17+
int recursive_mkdir(const char * path, int recursiveMode, int quiet)
1818
{
19-
if (optRecursiveMode) {
19+
if (recursiveMode) {
2020
char fullname[MAXPATH];
2121
char *p = fullname;
2222
int flag_not_done = 0;
@@ -43,7 +43,7 @@ int recursive_mkdir(const char * path, int optRecursiveMode, int optQuiet)
4343
ret = mkdir(fullname);
4444
}
4545
if (ret) {
46-
if (!optQuiet) {
46+
if (!quiet) {
4747
/* TODO show error message */
4848
}
4949
return ret;

cmd/rmdir.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ int rmdir_withfiles(char * path, int maxlen)
9696
return rmdir(path);
9797
}
9898

99-
int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
99+
int recursive_rmdir(const char * path, int recursiveMode, int quiet)
100100
{
101-
if (optRecursiveMode) {
101+
if (recursiveMode) {
102102
struct dos_ffblk f;
103103
char fullname[MAXPATH + sizeof(f.ff_name) + 2], *p;
104104
int len;
@@ -133,7 +133,7 @@ int recursive_rmdir(const char * path, int optRecursiveMode, int optQuiet)
133133
*p = 0;
134134

135135
/* prompt user if they are sure, regardless if files or not */
136-
if (!optQuiet) {
136+
if (!quiet) {
137137
int r;
138138
r = userprompt(PROMPT_DELETE_ALL, fullname); /* Are you sure? TODO fix me */
139139

include/misc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ char *cwd(int drive);
9191
char *abspath(const char * const fnam, const int warn);
9292
char *truepath(const char * const fnam);
9393
int changeDrive(int drive);
94-
int mk_rd_dir(char *param, int (*func) (const char *, int optRecursiveMode, int optQuiet), char *fctname);
94+
int mk_rd_dir(char *param, int (*func) (const char *, int recursiveMode, int quiet), char *fctname);
9595
void cutBackslash(char * const s);
9696
int cd_dir(char *param, int cdd, const char * const fctname);
9797
enum OnOff onoffStr(char *line);

lib/mk_rddir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ optScanFct(opt_md_rd)
3535
#define SCANNER_FCT 0
3636
#endif
3737

38-
int mk_rd_dir(char *param, int (*func) (const char *, int optRecursiveMode, int optQuiet), char *fctname)
38+
int mk_rd_dir(char *param, int (*func) (const char *, int recursiveMode, int quiet), char *fctname)
3939
{ char **argv;
4040
int argc, opts;
4141
int rv;

0 commit comments

Comments
 (0)