[MPlayer-cvslog] r33008 - trunk/gui/app.c

[ib]

Author: ib
Date: Thu Mar  3 12:43:01 2011
New Revision: 33008

Log:
Fix memory leak in appClearItem().

Mask wasn't freed.

Additionally: symbolic constants are used for initialization where possible,
the pressed default is btnDisabled now, gfree() is preferred to free() and
setting NULL, and statements are rearranged according to members in structure.

Modified:
   trunk/gui/app.c

Modified: trunk/gui/app.c
==============================================================================
--- trunk/gui/app.c	Thu Mar  3 12:06:42 2011	(r33007)
+++ trunk/gui/app.c	Thu Mar  3 12:43:01 2011	(r33008)
@@ -21,6 +21,9 @@
 
 #include "app.h"
 
+#include "gui/skin/font.h"
+#include "interface.h"
+
 listItems appMPlayer;
 
 static const evName evNames[] = {
@@ -78,25 +81,30 @@ static const int evBoxs = sizeof(evNames
 
 static void appClearItem(wItem *item)
 {
-    item->type    = 0;
+    item->type   = itNone;
     item->x       = 0;
     item->y       = 0;
     item->width   = 0;
     item->height  = 0;
-    item->pwidth  = 0;
-    item->pheight = 0;
-    item->message = 0;
-    item->pressed = btnReleased;
-    item->tmp     = 0;
     bpFree(&item->Bitmap);
+    bpFree(&item->Mask);
     item->fontid = 0;
-    free(item->label);
-    item->label = NULL;
-    free(item->text);
-    item->text      = NULL;
+    item->align  = fntAlignLeft;
+    gfree((void **)&item->label);
+    item->pwidth    = 0;
+    item->pheight   = 0;
+    item->numphases = 0;
+    item->value     = 0;
+    item->message   = evNone;
+    item->R = 0;
+    item->G = 0;
+    item->B = 0;
+    gfree((void **)&item->text);
     item->textwidth = 0;
     item->starttime = 0;
     item->last_x    = 0;
+    item->pressed   = btnDisabled;
+    item->tmp       = 0;
 }
 
 void appInitStruct(listItems *item)