mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/system/helpers.cpp: Replace wrong data types in get_fs_usage()

Browse Source 
- Change from 'long' to 'uint64_t'
- src/Makefile.am: Add -D_FILE_OFFSET_BITS=64 to AM_CPPFLAGS


Origin commit data
------------------
Branch: ni/coolstream
Commit: 36f3579df6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2013-10-07 22:26:59 +02:00
parent da34f33c46
commit 981702930d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@@ -46,7 +46,7 @@ bin_PROGRAMS = neutrino
neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp neutrino_SOURCES = neutrino_menue.cpp neutrino.cpp
AM_CPPFLAGS = AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64
if ENABLE_FLAC if ENABLE_FLAC
FLACLIBS = -lFLAC FLACLIBS = -lFLAC

4
src/system/helpers.cpp
View File

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

3
src/system/helpers.h
View File

@@ -22,6 +22,7 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include <stdint.h>
#include <string> #include <string>
int my_system(const char * cmd); int my_system(const char * cmd);
@@ -33,7 +34,7 @@ off_t file_size(const char *filename);
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, bool allow_tmp = false); int check_dir(const char * dir, bool allow_tmp = false);
bool get_fs_usage(const char * dir, long &total, long &used, long *bsize=NULL); bool get_fs_usage(const char * dir, uint64_t &btotal, uint64_t &bused, 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 getPathName(std::string &path); std::string getPathName(std::string &path);