From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 7 Apr 2007 10:21:52 +0000 (+0000)
Subject: ebl  use bmalloc instead of malloc
X-Git-Tag: Release-7.0.0~6608
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5166a80918a5ce06ac954b6caa0284bebf660b8;p=bacula%2Fbacula

ebl  use bmalloc instead of malloc


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4519 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/patches/testing/breg.c b/bacula/patches/testing/breg.c
index b7c7efe978..a0fbf9d6fd 100644
--- a/bacula/patches/testing/breg.c
+++ b/bacula/patches/testing/breg.c
@@ -43,7 +43,7 @@
 BREGEXP *new_bregexp(const char *motif)
 {
    Dmsg0(500, "bregexp: creating new bregexp object\n");
-   BREGEXP *self = (BREGEXP *)malloc(sizeof(BREGEXP));
+   BREGEXP *self = (BREGEXP *)bmalloc(sizeof(BREGEXP));
    memset(self, 0, sizeof(BREGEXP));
    
    if (!self->extract_regexp(motif)) {
@@ -57,7 +57,7 @@ BREGEXP *new_bregexp(const char *motif)
 
 #ifdef HAVE_REGEX_H
    /* TODO: que devient cette memoire... */
-   self->_regs_match = (int *) malloc (2*RE_NREGS * sizeof(int));
+   self->_regs_match = (int *) bmalloc (2*RE_NREGS * sizeof(int));
 
    self->regs.num_regs = RE_NREGS;
    self->regs.start = self->_regs_match;
@@ -82,7 +82,7 @@ void free_bregexp(BREGEXP *self)
       free_pool_memory(self->result);
    }
    if (self->_regs_match) {
-      free(self->_regs_match);
+      bfree(self->_regs_match);
    }
 
    regfree(&self->preg);
@@ -392,7 +392,7 @@ char *bregexp_build_where(char *strip_prefix,
 		   add_prefix?strlen(add_prefix)+5:0     + /* escape + 3*, + \0 */ 
 		   add_suffix?strlen(add_suffix)+14:0     )     * 2  + 3   + 1;
 
-   char *ret = (char *) malloc(str_size*sizeof(char));
+   char *ret = (char *) bmalloc(str_size*sizeof(char));
    POOLMEM *str_tmp = get_memory(str_size);
 
    *str_tmp = *ret = '\0';