mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

* system/helpers.cpp: Adding value 'bsize' as a possible return value

Browse Source
This commit is contained in:
micha-bbg
2013-01-01 10:43:28 +01:00
parent 158a8ba4ce
commit 6e1a2dc9cd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/helpers.cpp
View File

@@ -193,7 +193,7 @@ int check_dir(const char * dir)
return ret; return ret;
} }
bool get_fs_usage(const char * dir, long &btotal, long &bused) bool get_fs_usage(const char * dir, long &btotal, long &bused, long *bsize/*=NULL*/)
{ {
btotal = bused = 0; btotal = bused = 0;
struct statfs s; struct statfs s;
@@ -201,6 +201,8 @@ bool get_fs_usage(const char * dir, long &btotal, long &bused)
if (::statfs(dir, &s) == 0 && s.f_blocks) { if (::statfs(dir, &s) == 0 && s.f_blocks) {
btotal = s.f_blocks; btotal = s.f_blocks;
bused = s.f_blocks - s.f_bfree; bused = s.f_blocks - s.f_bfree;
if (bsize != NULL)
*bsize = s.f_bsize;
//printf("fs (%s): total %ld used %ld\n", dir, btotal, bused); //printf("fs (%s): total %ld used %ld\n", dir, btotal, bused);
return true; return true;
} }

2
src/system/helpers.h
View File

@@ -31,7 +31,7 @@ int safe_mkdir(char * path);
bool file_exists(const char *filename); bool file_exists(const char *filename);
void wakeup_hdd(const char *hdd_dir); void wakeup_hdd(const char *hdd_dir);
int check_dir(const char * dir); int check_dir(const char * dir);
bool get_fs_usage(const char * dir, long &total, long &used); bool get_fs_usage(const char * dir, long &total, long &used, long *bsize=NULL);
bool get_mem_usage(unsigned long &total, unsigned long &free); bool get_mem_usage(unsigned long &total, unsigned long &free);
std::string trim(std::string &str, const std::string &trimChars = " \n\r\t"); std::string trim(std::string &str, const std::string &trimChars = " \n\r\t");