Fix newvol.c

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

diff --git a/bacula/src/dird/protos.h b/bacula/src/dird/protos.h
index 10788274a419eb70b3f44db1182ee380502a318b..4f09c43feed023abf58bf6fe1f101d890064fdd0 100644 (file)
--- a/bacula/src/dird/protos.h
+++ b/bacula/src/dird/protos.h
@@ -30,11 +30,11 @@ extern int authenticate_user_agent(BSOCK *ua);
 
 /* autoprune.c */
 extern int do_autoprune(JCR *jcr);
-int prune_volumes(JCR *jcr);
+extern int prune_volumes(JCR *jcr);
 
 /* autorecycle.c */
-int recycle_a_volume(JCR *jcr, MEDIA_DBR *mr);
-int find_recycled_volume(JCR *jcr, MEDIA_DBR *mr);
+extern int recycle_a_volume(JCR *jcr, MEDIA_DBR *mr);
+extern int find_recycled_volume(JCR *jcr, MEDIA_DBR *mr);
 
 
 /* catreq.c */
@@ -50,12 +50,11 @@ extern int connect_to_file_daemon(JCR *jcr, int retry_interval,
 extern int send_include_list(JCR *jcr);
 extern int send_exclude_list(JCR *jcr);
 extern int get_attributes_and_put_in_catalog(JCR *jcr);
-extern int get_attributes_and_compare_to_catalog(JCR *jcr, int last_full_id);
+extern int get_attributes_and_compare_to_catalog(JCR *jcr, JobId_t JobId);
 extern int put_file_into_catalog(JCR *jcr, long file_index, char *fname, 
                          char *link, char *attr, int stream);
 
 /* job.c */
-extern void free_jcr(JCR *jcr);
 extern void set_jcr_defaults(JCR *jcr, JOB *job);
 extern void create_unique_job_name(JCR *jcr, char *base_name);
 extern void update_job_end_record(JCR *jcr);
@@ -71,9 +70,11 @@ extern int start_storage_daemon_job(JCR *jcr);
 extern int start_storage_daemon_message_thread(JCR *jcr);
 extern int32_t bget_msg(BSOCK *bs, int type);
 extern int response(BSOCK *fd, char *resp, char *cmd);
+extern void wait_for_storage_daemon_termination(JCR *jcr);
 
 /* newvol.c */
 extern int newVolume(JCR *jcr, MEDIA_DBR *mr);
 
 /* ua_cmd.c */
 extern int create_pool(B_DB *db, POOL *pool);
+extern void set_pool_dbr_defaults_in_media_dbr(MEDIA_DBR *mr, POOL_DBR *pr);