Ticket #1900: 1900-replacing-free-by-g_free.patch

src/man2hlp.c

@@ -822 +822 @@
             in_row = current_link->line;
             print_error (buffer);
         }
-        free (current_link->linkname);
+        g_free (current_link->linkname);
         if (current_link != &links)
-            free (current_link);
+            g_free (current_link);
         current_link = next;
     }
 
@@ -837 +837 @@
                      "", cnode->lname ? cnode->lname : lc_node, lc_node);
         fprintf (f_out, "\n");
 
-        free (cnode->node);
+        g_free (cnode->node);
         if (cnode->lname)
-            free (cnode->lname);
+            g_free (cnode->lname);
         if (cnode != &nodes)
-            free (cnode);
+            g_free (cnode);
         cnode = next;
     }
 
@@ -891 +891 @@
         return 1;
     }
 
-    free (outfile_buffer);
+    g_free (outfile_buffer);
     fclose_check (f_out);
     /* Closing everything */
 

src/pipethrough.c

@@ -156 +156 @@
         /*@releases buf->data; @*/
 {
         if (buf->data != NULL) {
-                free(buf->data);
+                g_free (buf->data);
                 buf->data = NULL;
         }
         buf->size = 0;
@@ -450 +450 @@
         /*@ensures isnull buf->data; @*/
 {
         if (buf->data != NULL) {
-                free(buf->data);
+                g_free (buf->data);
                 buf->data = NULL;
         }
         buf->size = 0;

vfs/mcfsutil.c

@@ -186 +186 @@
             /* Don't use glib functions here - this code is used by mcserv */
             text = malloc (len + 1);
             if (socket_read_block (sock, text, len) == 0) {
-                free (text);
+                g_free (text);
                 va_end (ap);
                 return 0;
             }

vfs/samba/lib/charset.c

@@ -315 +315 @@
   if(fp != NULL)
     fclose(fp);
   if(cp_p)
-    free((char *)cp_p);
+    g_free ((char *)cp_p);
   return NULL;
 }
 
@@ -392 +392 @@
     }
   }
 
-  free(extra_chars);
+  g_free (extra_chars);
 }

vfs/samba/lib/username.c

@@ -160 +160 @@
       pwret = getpwanam(s);
       if (pwret)
         {
-          free(ret->pw_passwd);
+          g_free (ret->pw_passwd);
           ret->pw_passwd = pwret->pwa_passwd;
         }
 #endif

vfs/samba/lib/util.c

@@ -1642 +1642 @@
   void *ret=NULL;
 
   if (size == 0) {
-    if (p) free(p);
+    if (p) g_free (p);
     DEBUG(5,("Realloc asked for 0 bytes\n"));
     return NULL;
   }
@@ -2251 +2251 @@
 #if 0
   if (!isalnum(*name2))
     {
-      free(name2);
+      g_free (name2);
       return(NULL);
     }
 #endif /* 0 */
@@ -2259 +2259 @@
   ret = sys_gethostbyname(name2);
   if (ret != NULL)
     {
-      free(name2);
+      g_free (name2);
       return(ret);
     }
 
@@ -2268 +2268 @@
   ret = sys_gethostbyname(name2);
   if (ret != NULL)
     {
-      free(name2);
+      g_free (name2);
       return(ret);
     }
 
@@ -2277 +2277 @@
   ret = sys_gethostbyname(name2);
   if (ret != NULL)
     {
-      free(name2);
+      g_free (name2);
       return(ret);
     }
   
   /* nothing works :-( */
-  free(name2);
+  g_free (name2);
   return(NULL);
 }
 
@@ -2533 +2533 @@
     return;
 
   if(name_array->name != NULL)
-    free(name_array->name);
+    g_free (name_array->name);
 
-  free((char *)name_array);
+  g_free ((char *)name_array);
 }
 
 /****************************************************************************
@@ -2841 +2841 @@
 /*****************************************************************
 zero a memory area then free it. Used to catch bugs faster
 *****************************************************************/  
-void zero_free(void *p, size_t size)
+void zero_free (void *p, size_t size)
 {
         memset(p, 0, size);
-        free(p);
+        g_free (p);
 }
 
 

vfs/samba/lib/util_file.c

@@ -308 +308 @@
           return(s);
         case EOF:
           if (len <= 0 && !s2) 
-            free(s);
+            g_free (s);
           return(len>0?s:NULL);
         case ' ':
           if (start_of_line)

vfs/samba/lib/util_str.c

@@ -980 +980 @@
   if (!s || !(*s)) return;
   if (*s == null_string)
     *s = NULL;
-  if (*s) free(*s);
+  if (*s) g_free (*s);
   *s = NULL;
 }
 

vfs/samba/libsmb/clientgen.c

@@ -528 +528 @@
         }
         
         if (rparam)
-      free(rparam);
+      g_free (rparam);
         if (rdata)
-      free(rdata);
+      g_free (rdata);
         return (cli->rap_error == 0);
 }
 #endif /*0 */
@@ -592 +592 @@
     }
   
   if (rparam)
-    free(rparam);
+    g_free (rparam);
   if (rdata)
-    free(rdata);
+    g_free (rdata);
 
   return count;
 }
@@ -665 +665 @@
         }
   
         if (rparam)
-      free(rparam);
+      g_free (rparam);
         if (rdata)
-      free(rdata);
+      g_free (rdata);
         
         return(count > 0);
 }
@@ -1745 +1745 @@
                 *mode = SVAL(rdata,l1_attrFile);
         }
 
-        if (rdata) free(rdata);
-        if (rparam) free(rparam);
+        if (rdata) g_free (rdata);
+        if (rparam) g_free (rparam);
         return True;
 }
 
@@ -1812 +1812 @@
                 *ino = IVAL(rdata, 64);
         }
 
-        if (rdata) free(rdata);
-        if (rparam) free(rparam);
+        if (rdata) g_free (rdata);
+        if (rparam) g_free (rparam);
         return True;
 }
 #endif  /* 0 */
@@ -1884 +1884 @@
                 *ino = IVAL(rdata, 64);
         }
 
-        if (rdata) free(rdata);
-        if (rparam) free(rparam);
+        if (rdata) g_free (rdata);
+        if (rparam) g_free (rparam);
         return True;
 }
 
@@ -2141 +2141 @@
 
                 total_received += ff_searchcount;
 
-                if (rdata) free(rdata); rdata = NULL;
-                if (rparam) free(rparam); rparam = NULL;
+                if (rdata) g_free (rdata); rdata = NULL;
+                if (rparam) g_free (rparam); rparam = NULL;
                 
                 DEBUG(3,("received %d entries (eos=%d resume=%d)\n",
                          ff_searchcount,ff_eos,ff_resume_key));
@@ -2156 +2156 @@
         }
 
         /* free up the dirlist buffer */
-        if (dirlist) free(dirlist);
+        if (dirlist) g_free (dirlist);
         return(total_received);
 }
 
@@ -2405 +2405 @@
 {
         if (cli->outbuf)
         {
-                free(cli->outbuf);
+                g_free (cli->outbuf);
         }
         if (cli->inbuf)
         {
-                free(cli->inbuf);
+                g_free (cli->inbuf);
         }
 #ifdef WITH_SSL
     if (cli->fd != -1)