Apply fix from Martin Simmons to clear structure before

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

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 942ac1a4eb5154e5acd99de0edc8d74194b93456..61c01a7cab8d099013957d96942b1d03253a9564 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -23,7 +23,7 @@
 
  */
 
-struct JCR;
+class JCR;
 
 /* attr.c */
 ATTR     *new_attr();
@@ -71,11 +71,9 @@ bool       bnet_send             (BSOCK *bsock);
 bool       bnet_fsend            (BSOCK *bs, const char *fmt, ...);
 bool       bnet_set_buffer_size  (BSOCK *bs, uint32_t size, int rw);
 bool       bnet_sig              (BSOCK *bs, int sig);
-#ifdef HAVE_TLS
 int        bnet_tls_server       (TLS_CONTEXT *ctx, BSOCK *bsock,
                                   alist *verify_list);
 int        bnet_tls_client       (TLS_CONTEXT *ctx, BSOCK *bsock);
-#endif /* HAVE_TLS */
 BSOCK *    bnet_connect          (JCR *jcr, int retry_interval,
                int max_retry_time, const char *name, char *host, char *service,
                int port, int verbose);
@@ -125,8 +123,8 @@ char *           edit_uint64_with_commas   (uint64_t val, char *buf);
 char *           add_commas              (char *val, char *buf);
 char *           edit_uint64             (uint64_t val, char *buf);
 char *           edit_int64              (int64_t val, char *buf);
-int              duration_to_utime       (char *str, utime_t *value);
-int              size_to_uint64(char *str, int str_len, uint64_t *rtn_value);
+bool             duration_to_utime       (char *str, utime_t *value);
+bool             size_to_uint64(char *str, int str_len, uint64_t *rtn_value);
 char             *edit_utime             (utime_t val, char *buf, int buf_len);
 bool             is_a_number             (const char *num);
 bool             is_an_integer           (const char *n);
@@ -141,6 +139,8 @@ void read_last_jobs_list(int fd, uint64_t addr);
 uint64_t write_last_jobs_list(int fd, uint64_t addr);
 void write_state_file(char *dir, const char *progname, int port);
 void job_end_push(JCR *jcr, void job_end_cb(JCR *jcr,void *), void *ctx);
+void lock_jobs();
+void unlock_jobs();
 
 
 /* lex.c */
@@ -194,6 +194,7 @@ void             init_signals             (void terminate(int sig));
 void             init_stack_dump          (void);
 
 /* scan.c */
+void             strip_leading_space     (char *str);
 void             strip_trailing_junk     (char *str);
 void             strip_trailing_slashes  (char *dir);
 bool             skip_spaces             (char **msg);
@@ -211,7 +212,6 @@ int             bsscanf(const char *buf, const char *fmt, ...);
 int              init_tls                (void);
 int              cleanup_tls             (void);
 
-#ifdef HAVE_TLS
 TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *ca_certdir,
                                           const char *certfile,
@@ -221,6 +221,7 @@ TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *dhfile,
                                           bool verify_peer);
 void             free_tls_context        (TLS_CONTEXT *ctx);
+#ifdef HAVE_TLS
 bool             tls_postconnect_verify_host  (TLS_CONNECTION *tls,
                                                const char *host);
 bool             tls_postconnect_verify_cn    (TLS_CONNECTION *tls,