From bb82ddcb2bc6c7515b39c0b5c181d5088d696263 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 19 Apr 2001 22:55:02 +0000
Subject: [PATCH] Eliminated duplicate function: gettotalfiles()
---
src/sbbs3/data.cpp | 12 ------------
src/sbbs3/execfile.cpp | 6 +++---
src/sbbs3/sbbs.h | 1 -
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/sbbs3/data.cpp b/src/sbbs3/data.cpp
index 823030eab0..cc3cb1e962 100644
--- a/src/sbbs3/data.cpp
+++ b/src/sbbs3/data.cpp
@@ -153,18 +153,6 @@ int sbbs_t::getuserxfers(int fromuser, int destuser, char *fname)
return(found);
}
-/****************************************************************************/
-/* Returns the number of files in the database for 'dir' */
-/****************************************************************************/
-uint sbbs_t::gettotalfiles(uint dirnum)
-{
- char str[81];
-
- sprintf(str,"%s%s.ixb", cfg.dir[dirnum]->data_dir, cfg.dir[dirnum]->code);
- return((uint)(flength(str)/F_IXBSIZE));
-}
-
-
/****************************************************************************/
/* Fills the timeleft variable with the correct value. Hangs up on the */
/* user if their time is up. */
diff --git a/src/sbbs3/execfile.cpp b/src/sbbs3/execfile.cpp
index 83135dde3d..f4d6ef5e7b 100644
--- a/src/sbbs3/execfile.cpp
+++ b/src/sbbs3/execfile.cpp
@@ -277,7 +277,7 @@ int sbbs_t::exec_file(csi_t *csi)
bputs(text[CantUploadHere]);
return(0); }
- if(gettotalfiles(i)>=cfg.dir[i]->maxfiles)
+ if(getfiles(&cfg,i)>=cfg.dir[i]->maxfiles)
bputs(text[DirFull]);
else {
upload(i);
@@ -288,7 +288,7 @@ int sbbs_t::exec_file(csi_t *csi)
if(cfg.user_dir==INVALID_DIR) {
bputs(text[NoUserDir]);
return(0); }
- if(gettotalfiles(cfg.user_dir)>=cfg.dir[cfg.user_dir]->maxfiles)
+ if(getfiles(&cfg,cfg.user_dir)>=cfg.dir[cfg.user_dir]->maxfiles)
bputs(text[UserDirFull]);
else if(useron.rest&FLAG('U'))
bputs(text[R_Upload]);
@@ -303,7 +303,7 @@ int sbbs_t::exec_file(csi_t *csi)
if(cfg.sysop_dir==INVALID_DIR) {
bputs(text[NoSysopDir]);
return(0); }
- if(gettotalfiles(cfg.sysop_dir)>=cfg.dir[cfg.sysop_dir]->maxfiles)
+ if(getfiles(&cfg,cfg.sysop_dir)>=cfg.dir[cfg.sysop_dir]->maxfiles)
bputs(text[DirFull]);
else if(useron.rest&FLAG('U'))
bputs(text[R_Upload]);
diff --git a/src/sbbs3/sbbs.h b/src/sbbs3/sbbs.h
index 8efff08309..b142d902f8 100644
--- a/src/sbbs3/sbbs.h
+++ b/src/sbbs3/sbbs.h
@@ -346,7 +346,6 @@ public:
int dir_op(uint dirnum);
int getuserxfers(int fromuser, int destuser, char *fname);
- uint gettotalfiles(uint dirnum);
void getnodeext(uint number, char * str);
void putnodeext(uint number, char * str);
void getnodedat(uint number, node_t * node, bool lock);
--
GitLab