From 7e43f793815fd2c4e0b43930aa202cc9388a0bff Mon Sep 17 00:00:00 2001 From: Krisztian Litkey Date: Fri, 21 Mar 2014 23:01:03 +0200 Subject: [PATCH] system-monitor: fix member enum order error Fix order error causing a conditional jump depending on an uninitialized value, caught by valgrind. Change-Id: Ib5ddb3cbd046f4ad668173832bb6d974a505487a --- src/plugins/system-monitor/mem-watch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/system-monitor/mem-watch.c b/src/plugins/system-monitor/mem-watch.c index f9ed3e8..94ba97e 100644 --- a/src/plugins/system-monitor/mem-watch.c +++ b/src/plugins/system-monitor/mem-watch.c @@ -74,7 +74,7 @@ MRP_LUA_MEMBER_LIST_TABLE(mem_watch_members, MRP_LUA_CLASS_STRING ("sample" , 0, setmember, getmember, RO ) MRP_LUA_CLASS_ANY ("limits" , 0, setmember, getmember, RO ) MRP_LUA_CLASS_INTEGER("polling" , 0, setmember, getmember, RO|NOINIT ) - MRP_LUA_CLASS_INTEGER("alpha" , 0, setmember, getmember, NOFLAGS) + MRP_LUA_CLASS_DOUBLE ("alpha" , 0, setmember, getmember, NOFLAGS) MRP_LUA_CLASS_INTEGER("window" , 0, setmember, getmember, NOFLAGS) MRP_LUA_CLASS_INTEGER("raw" , 0, setmember, getmember, RO|NOINIT ) MRP_LUA_CLASS_INTEGER("value" , 0, setmember, getmember, RO|NOINIT ) @@ -94,8 +94,8 @@ typedef enum { MEM_WATCH_MEMBER_SAMPLE, MEM_WATCH_MEMBER_LIMITS, MEM_WATCH_MEMBER_POLLING, - MEM_WATCH_MEMBER_WINDOW, MEM_WATCH_MEMBER_ALPHA, + MEM_WATCH_MEMBER_WINDOW, MEM_WATCH_MEMBER_RAW, MEM_WATCH_MEMBER_VALUE, MEM_WATCH_MEMBER_CURRENT, -- 2.7.4