From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 13 Oct 2008 19:42:28 +0000 (+0000)
Subject: Change API malloc/free entrypoint names
X-Git-Tag: Release-7.0.0~3966
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c5e019747db7f8584ab1e1224caf5fcac45d9a64;p=bacula%2Fbacula

Change API malloc/free entrypoint names

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

diff --git a/bacula/kernstodo b/bacula/kernstodo
index 967a215fe7..a9e713efcb 100644
--- a/bacula/kernstodo
+++ b/bacula/kernstodo
@@ -73,14 +73,11 @@ Priority:
 ================
 - Detect deadlocks in reservations.
 - Plugins:
-  - add malloc/restore
   - Add list during dump
   - Add in plugin code flag
   - Add bRC_EndJob -- stops more calls to plugin this job
   - Add bRC_Term (unload plugin)
   - remove time_t from Jmsg and use utime_t?
-  - add more doc
-     - distinguish two types of plugins
 - Extended ACLs
 - Deadlock detection, watchdog sees if counter advances when jobs are
   running.  With debug on, can do a "status" command.
diff --git a/bacula/src/dird/vbackup.c b/bacula/src/dird/vbackup.c
index a382c073bb..18eb34c332 100644
--- a/bacula/src/dird/vbackup.c
+++ b/bacula/src/dird/vbackup.c
@@ -166,7 +166,7 @@ _("This Job is not an Accurate backup so is not equivalent to a Full backup.\n")
    Dmsg1(10, "Accurate jobids=%s\n", jobids);
    if (*jobids == 0) {
       free_pool_memory(jobids);
-      Jmsg(jcr, M_FATAL, 0, _("Cannot find previous JobIds.\n"));
+      Jmsg(jcr, M_FATAL, 0, _("No previous Jobs found.\n"));
       return false;
    }
 
diff --git a/bacula/src/filed/fd_plugins.h b/bacula/src/filed/fd_plugins.h
index 302ebb2346..afeb7ecadd 100644
--- a/bacula/src/filed/fd_plugins.h
+++ b/bacula/src/filed/fd_plugins.h
@@ -206,9 +206,9 @@ typedef struct s_baculaFuncs {
        int type, time_t mtime, const char *fmt, ...);     
    bRC (*DebugMessage)(bpContext *ctx, const char *file, int line,
        int level, const char *fmt, ...);
-   void *(*malloc)(bpContext *ctx, const char *file, int line, 
+   void *(*baculaMalloc)(bpContext *ctx, const char *file, int line, 
        size_t size);
-   void (*free)(bpContext *ctx, const char *file, int line, void *mem);
+   void (*baculaFree)(bpContext *ctx, const char *file, int line, void *mem);
 } bFuncs;