Massive SD calling sequence reorganization

[bacula/bacula] / bacula / src / lib / protos.h

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index dbf6828e49ed2203d3ac5ef2c52dfcb5ea60cfb7..b5957e19c1606f11589bc298bd7818a1dabc2907 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -40,7 +40,9 @@ int     bin_to_base64          (char *buf, char *bin, int len);
 
 /* bsys.c */
 char    *bstrncpy               (char *dest, const char *src, int maxlen);
+char    *bstrncpy               (char *dest, POOL_MEM &src, int maxlen);
 char    *bstrncat               (char *dest, const char *src, int maxlen);
+char    *bstrncat               (char *dest, POOL_MEM &src, int maxlen);
 void    *b_malloc               (const char *file, int line, size_t size);
 #ifndef DEBUG
 void    *bmalloc                (size_t size);
@@ -194,13 +196,13 @@ int               bsscanf(const char *buf, const char *fmt, ...);
 int             is_buf_zero             (char *buf, int len);
 void            lcase                   (char *str);
 void            bash_spaces             (char *str);
+void            bash_spaces             (POOL_MEM &pm);
 void            unbash_spaces           (char *str);
+void            unbash_spaces           (POOL_MEM &pm);
 char *          encode_time             (time_t time, char *buf);
 char *          encode_mode             (mode_t mode, char *buf);
 int             do_shell_expansion      (char *name, int name_len);
 void            jobstatus_to_ascii      (int JobStatus, char *msg, int maxlen);
-int             pm_strcat               (POOLMEM **pm, const char *str);
-int             pm_strcpy               (POOLMEM **pm, const char *str);
 int             run_program             (char *prog, int wait, POOLMEM *results);
 const char *    job_type_to_str         (int type);
 const char *    job_status_to_str       (int stat);