[svn-commits] bbryant: branch 1.6.0 r131486 - in /branches/1.6.0: ./ funcs/func_sysinfo.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Wed Jul 16 16:54:38 2008
New Revision: 131486

URL: http://svn.digium.com/view/asterisk?view=rev&rev=131486
Log:
Merged revisions 131484 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r131484 | bbryant | 2008-07-16 16:54:08 -0500 (Wed, 16 Jul 2008) | 4 lines

Fixes sysinfo operator issue also fixed elsewhere in r131445.

(issue #13057)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/funcs/func_sysinfo.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/funcs/func_sysinfo.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/funcs/func_sysinfo.c?view=diff&rev=131486&r1=131485&r2=131486
==============================================================================
--- branches/1.6.0/funcs/func_sysinfo.c (original)
+++ branches/1.6.0/funcs/func_sysinfo.c Wed Jul 16 16:54:38 2008
@@ -60,15 +60,15 @@
 	else if (!strcasecmp("uptime", data)) {             /* in hours */
 		snprintf(buf, len, "%ld", sys_info.uptime/3600);
 	} else if (!strcasecmp("totalram", data)) {         /* in KiB */
-		snprintf(buf, len, "%ld",(sys_info.totalram / sys_info.mem_unit)/1024);
+		snprintf(buf, len, "%ld",(sys_info.totalram * sys_info.mem_unit)/1024);
 	} else if (!strcasecmp("freeram", data)) {          /* in KiB */
-		snprintf(buf, len, "%ld",(sys_info.freeram / sys_info.mem_unit)/1024);
+		snprintf(buf, len, "%ld",(sys_info.freeram * sys_info.mem_unit)/1024);
 	} else if (!strcasecmp("bufferram", data)) {        /* in KiB */
-		snprintf(buf, len, "%ld",(sys_info.bufferram / sys_info.mem_unit)/1024);
+		snprintf(buf, len, "%ld",(sys_info.bufferram * sys_info.mem_unit)/1024);
 	} else if (!strcasecmp("totalswap", data)) {        /* in KiB */
-		snprintf(buf, len, "%ld",(sys_info.totalswap / sys_info.mem_unit)/1024);
+		snprintf(buf, len, "%ld",(sys_info.totalswap * sys_info.mem_unit)/1024);
 	} else if (!strcasecmp("freeswap", data)) {         /* in KiB */
-		snprintf(buf, len, "%ld",(sys_info.freeswap / sys_info.mem_unit)/1024);
+		snprintf(buf, len, "%ld",(sys_info.freeswap * sys_info.mem_unit)/1024);
 	} else if (!strcasecmp("numprocs", data)) {
 		snprintf(buf, len, "%d", sys_info.procs);
 	}