summaryrefslogtreecommitdiff
path: root/indra/llwindow/llwindowsdl.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-10-11 00:09:04 +0000
committerDon Kjer <don@lindenlab.com>2012-10-11 00:09:04 +0000
commitc06c35609c6683731eaea283468f6b32af18fea2 (patch)
tree69e067fb2d8d602948d618ec7cb71ace149d6e39 /indra/llwindow/llwindowsdl.cpp
parent19e43e4b588d4aec8f23498993a3a22c0e08a329 (diff)
Updating linux build to gcc4.6
Diffstat (limited to 'indra/llwindow/llwindowsdl.cpp')
-rw-r--r--indra/llwindow/llwindowsdl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index de731df228..c7b141d7c1 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -1643,24 +1643,24 @@ void check_vm_bloat()
const long long significant_vm_difference = 250 * 1024*1024;
const long long significant_rss_difference = 50 * 1024*1024;
- ssize_t res;
size_t dummy;
char *ptr;
- for (int i=0; i<22; ++i) // parse past the values we don't want
+ size_t delim_result = 0;
+ for (int i=0; i<22 && delim_result > -1; ++i) // parse past the values we don't want
{
ptr = NULL;
- res = getdelim(&ptr, &dummy, ' ', fp);
+ delim_result = getdelim(&ptr, &dummy, ' ', fp);
free(ptr);
}
// 23rd space-delimited entry is vsize
ptr = NULL;
- res = getdelim(&ptr, &dummy, ' ', fp);
+ delim_result = getdelim(&ptr, &dummy, ' ', fp);
llassert(ptr);
long long this_vm_size = atoll(ptr);
free(ptr);
// 24th space-delimited entry is RSS
ptr = NULL;
- res = getdelim(&ptr, &dummy, ' ', fp);
+ delim_result = getdelim(&ptr, &dummy, ' ', fp);
llassert(ptr);
long long this_rss_size = getpagesize() * atoll(ptr);
free(ptr);