aboutsummaryrefslogtreecommitdiffstats
path: root/epan/app_mem_usage.c
diff options
context:
space:
mode:
authorEvan Huus <eapache@gmail.com>2013-07-30 16:50:31 +0000
committerEvan Huus <eapache@gmail.com>2013-07-30 16:50:31 +0000
commit338701e9fdd0acd1ead5d8eb68993a40cce00a5e (patch)
tree6fac4c494d9192484364e291ef77cd0a86d598a5 /epan/app_mem_usage.c
parentd0c26ae7cadcf44204d7aeda2fc3c1f4ba1c9c8c (diff)
Move a few variables inside the appropriate ifdefs.
svn path=/trunk/; revision=51029
Diffstat (limited to 'epan/app_mem_usage.c')
-rw-r--r--epan/app_mem_usage.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/app_mem_usage.c b/epan/app_mem_usage.c
index 6e16cb63ea..e1bdf1bba3 100644
--- a/epan/app_mem_usage.c
+++ b/epan/app_mem_usage.c
@@ -69,9 +69,8 @@ get_total_mem_used_by_app(void)
return (int)workingSize;
}
#else
- char *temp, *p = NULL;
+ char *temp;
FILE *file = NULL;
- size_t rd = 0;
int rozmiar = 0, unmres;
struct utsname sys;
@@ -84,13 +83,15 @@ get_total_mem_used_by_app(void)
{
#ifdef __linux__
char buf[1024];
+ char *p = NULL;
+ size_t rd = 0;
rd = fread(buf, 1, 1024, file);
fclose(file);
if (rd == 0)
{
return -1;
- }
+ }
p = strstr(buf, "VmSize");
if (p) {
sscanf(p, "VmSize: %d kB", &rozmiar);
@@ -98,6 +99,7 @@ get_total_mem_used_by_app(void)
return -1;
}
#elif __sun
+ size_t rd = 0;
pstatus_t proc_stat;
rd = fread(&proc_stat, sizeof(proc_stat), 1, file);
fclose(file);