aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llcommon/llsys.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llcommon/llsys.cpp')
-rw-r--r--linden/indra/llcommon/llsys.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/llcommon/llsys.cpp b/linden/indra/llcommon/llsys.cpp
index ccdcd00..1285851 100644
--- a/linden/indra/llcommon/llsys.cpp
+++ b/linden/indra/llcommon/llsys.cpp
@@ -293,7 +293,7 @@ U32 LLOSInfo::getProcessVirtualSizeKB()
293#if LL_WINDOWS 293#if LL_WINDOWS
294#endif 294#endif
295#if LL_LINUX 295#if LL_LINUX
296 FILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); 296 LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
297 S32 numRead = 0; 297 S32 numRead = 0;
298 char buff[STATUS_SIZE]; /* Flawfinder: ignore */ 298 char buff[STATUS_SIZE]; /* Flawfinder: ignore */
299 299
@@ -336,7 +336,7 @@ U32 LLOSInfo::getProcessResidentSizeKB()
336#if LL_WINDOWS 336#if LL_WINDOWS
337#endif 337#endif
338#if LL_LINUX 338#if LL_LINUX
339 FILE* status_filep = LLFile::fopen("/proc/self/status", "rb"); 339 LLFILE* status_filep = LLFile::fopen("/proc/self/status", "rb");
340 if (status_filep != NULL) 340 if (status_filep != NULL)
341 { 341 {
342 S32 numRead = 0; 342 S32 numRead = 0;
@@ -398,7 +398,7 @@ LLCPUInfo::LLCPUInfo()
398 398
399#elif LL_LINUX 399#elif LL_LINUX
400 std::map< LLString, LLString > cpuinfo; 400 std::map< LLString, LLString > cpuinfo;
401 FILE* cpuinfo_fp = LLFile::fopen(CPUINFO_FILE, "rb"); 401 LLFILE* cpuinfo_fp = LLFile::fopen(CPUINFO_FILE, "rb");
402 if(cpuinfo_fp) 402 if(cpuinfo_fp)
403 { 403 {
404 char line[MAX_STRING]; 404 char line[MAX_STRING];
@@ -486,7 +486,7 @@ void LLCPUInfo::stream(std::ostream& s) const
486 } 486 }
487#else 487#else
488 // *NOTE: This works on linux. What will it do on other systems? 488 // *NOTE: This works on linux. What will it do on other systems?
489 FILE* cpuinfo = LLFile::fopen(CPUINFO_FILE, "rb"); 489 LLFILE* cpuinfo = LLFile::fopen(CPUINFO_FILE, "rb");
490 if(cpuinfo) 490 if(cpuinfo)
491 { 491 {
492 char line[MAX_STRING]; 492 char line[MAX_STRING];
@@ -621,7 +621,7 @@ void LLMemoryInfo::stream(std::ostream& s) const
621 s << "Total Physical KB: " << phys << std::endl; 621 s << "Total Physical KB: " << phys << std::endl;
622#else 622#else
623 // *NOTE: This works on linux. What will it do on other systems? 623 // *NOTE: This works on linux. What will it do on other systems?
624 FILE* meminfo = LLFile::fopen(MEMINFO_FILE,"rb"); 624 LLFILE* meminfo = LLFile::fopen(MEMINFO_FILE,"rb");
625 if(meminfo) 625 if(meminfo)
626 { 626 {
627 char line[MAX_STRING]; /* Flawfinder: ignore */ 627 char line[MAX_STRING]; /* Flawfinder: ignore */
@@ -665,7 +665,7 @@ BOOL gunzip_file(const char *srcfile, const char *dstfile)
665 BOOL retval = FALSE; 665 BOOL retval = FALSE;
666 gzFile src = NULL; 666 gzFile src = NULL;
667 U8 buffer[UNCOMPRESS_BUFFER_SIZE]; 667 U8 buffer[UNCOMPRESS_BUFFER_SIZE];
668 FILE *dst = NULL; 668 LLFILE *dst = NULL;
669 S32 bytes = 0; 669 S32 bytes = 0;
670 (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */ 670 (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */
671 (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */ 671 (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */
@@ -700,7 +700,7 @@ BOOL gzip_file(const char *srcfile, const char *dstfile)
700 BOOL retval = FALSE; 700 BOOL retval = FALSE;
701 U8 buffer[COMPRESS_BUFFER_SIZE]; 701 U8 buffer[COMPRESS_BUFFER_SIZE];
702 gzFile dst = NULL; 702 gzFile dst = NULL;
703 FILE *src = NULL; 703 LLFILE *src = NULL;
704 S32 bytes = 0; 704 S32 bytes = 0;
705 (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */ 705 (void *) strcpy(tmpfile, dstfile); /* Flawfinder: ignore */
706 (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */ 706 (void *) strncat(tmpfile, ".t", sizeof(tmpfile) - strlen(tmpfile) -1); /* Flawfinder: ignore */