[Bacula-commits] bacula/src/lib bsys.c, 1.56, 1.57 protos.h, 1.130, 1.131

[Kern S. <ke...@us...>]

Update of /cvsroot/bacula/bacula/src/lib
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv20830/src/lib

Modified Files:
	bsys.c protos.h 
Log Message:
kes  wx-console crashes because of differences between Bacula and wxWidgets
     malloc()/free().  Tweek wx-console to use bmalloc()/bfree() for Bacula
     calls.
kes  correct improper indenting in wx-console/console_conf.c
kes  update wx-console header copyrights
kes  Fix bug #658 where wx-console mangles file/directory names containing
     commas.

Index: bsys.c
===================================================================
RCS file: /cvsroot/bacula/bacula/src/lib/bsys.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- bsys.c	27 Jul 2006 01:58:44 -0000	1.56
+++ bsys.c	25 Aug 2006 12:35:41 -0000	1.57
@@ -176,12 +176,16 @@
 
 
 
-#ifndef DEBUG
+#ifndef bmalloc
 void *bmalloc(size_t size)
 {
   void *buf;
 
+#ifdef SMARTALLOC
+  buf = sm_malloc(file, line, size);
+#else
   buf = malloc(size);
+#endif
   if (buf == NULL) {
      berrno be;
      Emsg1(M_ABORT, 0, _("Out of memory: ERR=%s\n"), be.strerror());
@@ -207,6 +211,18 @@
 }
 
 
+void bfree(void *buf)
+{
+#ifdef SMARTALLOC
+  sm_free(__FILE__, __LINE__, buf);
+#else
+  free(buf);
+#endif
+}
+
+
+
+
 void *brealloc (void *buf, size_t size)
 {
    buf = realloc(buf, size);

Index: protos.h
===================================================================
RCS file: /cvsroot/bacula/bacula/src/lib/protos.h,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -d -r1.130 -r1.131
--- protos.h	3 Jul 2006 18:28:36 -0000	1.130
+++ protos.h	25 Aug 2006 12:35:41 -0000	1.131
@@ -42,9 +42,10 @@
 bool      bstrcmp                (const char *s1, const char *s2);
 int       cstrlen                (const char *str);
 void     *b_malloc               (const char *file, int line, size_t size);
-#ifndef DEBUG
+#ifndef bmalloc
 void     *bmalloc                (size_t size);
 #endif
+void      bfree                  (void *buf);
 void     *brealloc               (void *buf, size_t size);
 void     *bcalloc                (size_t size1, size_t size2);
 int       bsnprintf              (char *str, int32_t size, const char *format, ...);