- Replaced all free() with wfree() where appropriate

- Fixed some memory leaks

WINGs/array.c

@@ -91,8 +91,8 @@ void
 WMFreeArray(WMArray *array)
 {
     WMEmptyArray(array);
-    free(array->items);
-    free(array);
+    wfree(array->items);
+    wfree(array);
 }
 
 

WINGs/bagtree.c

@@ -497,7 +497,7 @@ WMRemoveFromBag(WMBag *self, void *item)
         ptr = rbTreeDelete(self, ptr);
         if (self->destructor)
             self->destructor(ptr->data);
-        free(ptr);
+        wfree(ptr);
 
         return 1;
     } else {
@@ -518,7 +518,7 @@ WMEraseFromBag(WMBag *self, int index)
         ptr = rbTreeDelete(self, ptr);
         if (self->destructor)
             self->destructor(ptr->data);
-        free(ptr);
+        wfree(ptr);
 
         wassertrv(self->count == 0||self->root->index >= 0, 1);
 
@@ -548,7 +548,7 @@ WMDeleteFromBag(WMBag *self, int index)
         ptr = rbTreeDelete(self, ptr);
         if (self->destructor)
             self->destructor(ptr->data);
-        free(ptr);
+        wfree(ptr);
 
         wassertrv(self->count == 0||self->root->index >= 0, 1);
 
@@ -626,7 +626,7 @@ WMReplaceInBag(WMBag *self, int index, void *item)
         ptr = rbTreeDelete(self, ptr);
         if (self->destructor)
             self->destructor(ptr->data);
-        free(ptr);
+        wfree(ptr);
     } else if (ptr != self->nil) {
         old = ptr->data;
         ptr->data = item;
@@ -696,7 +696,7 @@ deleteTree(WMBag *self, W_Node *node)
 
     deleteTree(self, node->right);
 
-    free(node);
+    wfree(node);
 }
 
 
@@ -713,8 +713,8 @@ void
 WMFreeBag(WMBag *self)
 {
     WMEmptyBag(self);
-    free(self->nil);
-    free(self);
+    wfree(self->nil);
+    wfree(self);
 }
 
 

WINGs/configuration.c

@@ -92,7 +92,7 @@ W_ReadConfigurations(void)
         buttonName = WMGetUDStringForKey(defaults, "MouseWheelUp");
         if (buttonName) {
             button = getButtonWithName(buttonName, Button4);
-            free(buttonName);
+            wfree(buttonName);
         } else {
             button = Button4;
         }
@@ -101,7 +101,7 @@ W_ReadConfigurations(void)
         buttonName = WMGetUDStringForKey(defaults, "MouseWheelDown");
         if (buttonName) {
             button = getButtonWithName(buttonName, Button5);
-            free(buttonName);
+            wfree(buttonName);
         } else {
             button = Button5;
         }

WINGs/dragdestination.c

@@ -87,7 +87,7 @@ void
 WMUnregisterViewDraggedTypes(WMView *view)
 {
     if (view->droppableTypes != NULL)
-	free(view->droppableTypes);
+	wfree(view->droppableTypes);
     view->droppableTypes = NULL;
 }
 
@@ -128,7 +128,7 @@ void
 WMSetViewDragDestinationProcs(WMView *view, WMDragDestinationProcs *procs)
 {
     if (view->dragDestinationProcs == NULL) {
-	free(view->dragDestinationProcs);
+	wfree(view->dragDestinationProcs);
 	view->dragDestinationProcs = wmalloc(sizeof(WMDragDestinationProcs));
     }
     *view->dragDestinationProcs = *procs;

WINGs/dragsource.c

@@ -57,7 +57,7 @@ void
 WMSetViewDragSourceProcs(WMView *view, WMDragSourceProcs *procs)
 {
     if (view->dragSourceProcs)
-	free(view->dragSourceProcs);
+	wfree(view->dragSourceProcs);
     view->dragSourceProcs = wmalloc(sizeof(WMDragSourceProcs));
     
     *view->dragSourceProcs = *procs;

WINGs/string.c

@@ -74,7 +74,7 @@ wtokennext(char *word, char **next)
     else
 	t = wstrdup(ret);
 
-    free(ret);
+    wfree(ret);
     
     if (ctype==PRC_EOS)
 	*next = NULL;
@@ -151,8 +151,8 @@ wtokenjoin(char **list, int count)
 void
 wtokenfree(char **tokens, int count)
 {
-    while (--count) free(tokens[count]);
-    free(tokens);
+    while (--count) wfree(tokens[count]);
+    wfree(tokens);
 }
 
 

WINGs/wbrowser.c

@@ -282,7 +282,7 @@ drawTitleOfColumn(WMBrowser *bPtr, int column)
 			(bPtr->titleHeight-WMFontHeight(scr->boldFont))/2,
 			bPtr->columnSize.width, WACenter, WMColorGC(scr->white),
 			False, titleBuf, titleLen);
-	    free (titleBuf);
+	    wfree (titleBuf);
 	} else {
 	    W_PaintText(bPtr->view, bPtr->view->window, scr->boldFont, x,
 			(bPtr->titleHeight-WMFontHeight(scr->boldFont))/2,

WINGs/wcolorpanel.c

@@ -1261,7 +1261,7 @@ readConfiguration(W_ColorPanel *panel)
 	    WMSetPopUpButtonItemEnabled(panel->customPaletteHistoryBtn,
 		    item, perm_mask);
 	}
-	free(path);
+	wfree(path);
     }
     (void)closedir(dPtr);
 }
@@ -3340,8 +3340,9 @@ customPaletteMenuRemove(W_ColorPanel *panel)
 	
 	WMRemovePopUpButtonItem(panel->customPaletteHistoryBtn, item);
 
-	} else
-	    wsyserror("Couldn't remove palette %s\n", tmp);
+        } else {
+            wsyserror("Couldn't remove palette %s\n", tmp);
+        }
 
 	wfree(tmp);
     }
@@ -3686,10 +3687,7 @@ generateNewFilename(char *curName)
     
     ptr = curName;	
     
-    if (
-	((ptr = strrchr(ptr, '{')) == 0) || 
-	sscanf(ptr, "{%i}%c", &n, &c) != 1
-	) 
+    if (((ptr = strrchr(ptr, '{'))==0) || sscanf(ptr, "{%i}%c", &n, &c)!=1)
 	return wstrappend(curName, " {1}");
     
     baseLen = ptr - curName -1;
@@ -3760,7 +3758,7 @@ ulongToRColor(WMScreen *scr, unsigned long value)
     color.green = xcolor->green >> 8;
     color.blue  = xcolor->blue >> 8;
 
-    free(xcolor);
+    wfree(xcolor);
    
     return color;
 }

WINGs/wcolorwell.c

@@ -324,7 +324,7 @@ fetchDragData(WMView *self, char *type)
     
     data = WMCreateDataWithBytes(color, strlen(color)+1);
     
-    free(color);
+    wfree(color);
     
     return data;
 }

WINGs/wfont.c

@@ -50,9 +50,9 @@ generalize_xlfd (const char *xlfd)
 	     "-*-*-*-*-*-*-%s-*-*-*-*-*-*-*,*",
 	     xlfd, weight, slant, pxlsz, pxlsz);
 
-    free(pxlsz);
-    free(slant);
-    free(weight);
+    wfree(pxlsz);
+    wfree(slant);
+    wfree(weight);
 
     return buf;
 }
@@ -91,7 +91,7 @@ W_CreateFontSetWithGuess(Display *dpy, char *xlfd, char ***missing,
 
     fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string);
 
-    free(xlfd);
+    wfree(xlfd);
     return fs;
 }
 

WINGs/wmenuitem.c

@@ -67,13 +67,13 @@ void
 WMDestroyMenuItem(WMMenuItem *item)
 {
     if (item->title)
-	free(item->title);
+	wfree(item->title);
 
     if (item->image)
 	WMReleasePixmap(item->image);
 
     if (item->shortcutKey)
-	free(item->shortcutKey);
+	wfree(item->shortcutKey);
     
     if (item->onStateImage)
 	WMReleasePixmap(item->onStateImage);

WINGs/wruler.c

@@ -429,7 +429,7 @@ WMCreateRuler(WMWidget * parent)
     rPtr->view = W_CreateView(W_VIEW(parent));
 
     if (!rPtr->view) {
-        free(rPtr);
+        wfree(rPtr);
         return NULL;
     }
 

WINGs/wtext.c

@@ -2878,7 +2878,7 @@ WMCreateTextForDocumentType(WMWidget *parent,
     tPtr->view = W_CreateView(W_VIEW(parent));
     if (!tPtr->view) {
         perror("could not create text's view\n");
-        free(tPtr);
+        wfree(tPtr);
         return NULL;
     }
     tPtr->view->self = tPtr;