ebl use tokyocabinet by default instead of htable

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 161ba6ee243e9810804a4600c06bf85d32e3bdf8..4197b31e74b0651a7ddff3ff4e18a4483c83d62c 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -31,6 +31,9 @@
  *   Version $Id$
  */
 
+#ifndef __LIBPROTOS_H
+#define __LIBPROTOS_H
+
 class JCR;
 
 /* attr.c */
@@ -283,9 +286,9 @@ TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           bool verify_peer);
 void             free_tls_context        (TLS_CONTEXT *ctx);
 #ifdef HAVE_TLS
-bool             tls_postconnect_verify_host  (TLS_CONNECTION *tls,
+bool             tls_postconnect_verify_host(JCR *jcr, TLS_CONNECTION *tls,
                                                const char *host);
-bool             tls_postconnect_verify_cn    (TLS_CONNECTION *tls,
+bool             tls_postconnect_verify_cn(JCR *jcr, TLS_CONNECTION *tls,
                                                alist *verify_list);
 TLS_CONNECTION   *new_tls_connection     (TLS_CONTEXT *ctx, int fd);
 bool             tls_bsock_accept        (BSOCK *bsock);
@@ -301,7 +304,9 @@ bool             get_tls_enable          (TLS_CONTEXT *ctx);
 
 /* util.c */
 
+extern "C" {
 typedef char *(*job_code_callback_t)(JCR *, const char *);
+}
 
 bool             is_buf_zero             (char *buf, int len);
 void             lcase                   (char *str);
@@ -313,8 +318,8 @@ 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              run_program             (char *prog, int wait, POOLMEM *results);
-int              run_program_full_output (char *prog, int wait, POOLMEM *results);
+int              run_program             (char *prog, int wait, POOLMEM *&results);
+int              run_program_full_output (char *prog, int wait, POOLMEM *&results);
 const char *     job_type_to_str         (int type);
 const char *     job_status_to_str       (int stat);
 const char *     job_level_to_str        (int level);
@@ -340,3 +345,5 @@ btimer_t *start_thread_timer(JCR *jcr, pthread_t tid, uint32_t wait);
 void stop_thread_timer(btimer_t *wid);
 btimer_t *start_bsock_timer(BSOCK *bs, uint32_t wait);
 void stop_bsock_timer(btimer_t *wid);
+
+#endif /* __LIBPROTOS_H */