Replace explicit checks for "/" with calls to IsPathSeparator, strchr with first_path...

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

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 42b24ba0500380554d28171dba53f895638ed353..0bab20269f16403d87e014a4702c50ce3059bd82 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -27,6 +27,7 @@ bool     acquire_device_for_read(DCR *dcr);
 bool     release_device(DCR *dcr);
 DCR     *new_dcr(JCR *jcr, DEVICE *dev);
 void     free_dcr(DCR *dcr);
+void     detach_dcr_from_dev(DCR *dcr);
 
 /* From askdir.c */
 enum get_vol_info_rw {
@@ -82,22 +83,10 @@ void    display_tape_error_status(JCR *jcr, DEVICE *dev);
 
 /* From dev.c */
 DEVICE  *init_dev(JCR *jcr, DEVRES *device);
-off_t    lseek_dev(DEVICE *dev, off_t offset, int whence);
 bool     can_open_mounted_dev(DEVICE *dev);
-bool     truncate_dev(DCR *dcr);
-void     term_dev(DEVICE *dev);
-char *   strerror_dev(DEVICE *dev);
-void     clrerror_dev(DEVICE *dev, int func);
-bool     update_pos_dev(DEVICE *dev);
-bool     rewind_dev(DEVICE *dev);
 bool     load_dev(DEVICE *dev);
-int      flush_dev(DEVICE *dev);
-int      weof_dev(DEVICE *dev, int num);
 int      write_block(DEVICE *dev);
 uint32_t status_dev(DEVICE *dev);
-bool     eod_dev(DEVICE *dev);
-bool     fsf_dev(DEVICE *dev, int num);
-bool     bsf_dev(DEVICE *dev, int num);
 void     attach_jcr_to_device(DEVICE *dev, JCR *jcr);
 void     detach_jcr_from_device(DEVICE *dev, JCR *jcr);
 JCR     *next_attached_jcr(DEVICE *dev, JCR *jcr);
@@ -107,20 +96,18 @@ bool     double_dev_wait_time(DEVICE *dev);
 
 /* Get info about device */
 char *   dev_vol_name(DEVICE *dev);
-uint32_t dev_block(DEVICE *dev);
-uint32_t dev_file(DEVICE *dev);
 
 /* From dvd.c */
-int  dvd_open_next_part(DCR *dcr);
-bool dvd_write_part(DCR *dcr); 
-bool dvd_close_job(DCR *dcr);
-bool mount_dvd(DEVICE* dev, int timeout);
-bool unmount_dvd(DEVICE* dev, int timeout);
-void update_free_space_dev(DEVICE *dev);
-void make_mounted_dvd_filename(DEVICE *dev, POOL_MEM &archive_name);
-void make_spooled_dvd_filename(DEVICE *dev, POOL_MEM &archive_name);
-bool truncate_dvd(DCR *dcr);
-bool check_can_write_on_non_blank_dvd(DCR *dcr);
+int     dvd_open_next_part(DCR *dcr);
+bool    dvd_write_part(DCR *dcr); 
+bool    dvd_close_job(DCR *dcr);
+void    make_mounted_dvd_filename(DEVICE *dev, POOL_MEM &archive_name);
+void    make_spooled_dvd_filename(DEVICE *dev, POOL_MEM &archive_name);
+bool    truncate_dvd(DCR *dcr);
+bool    check_can_write_on_non_blank_dvd(DCR *dcr);
+int     find_num_dvd_parts(DCR *dcr);
+boffset_t   lseek_dvd(DCR *dcr, boffset_t offset, int whence);
+void    dvd_remove_empty_part(DCR *dcr);
 
 /* From device.c */
 bool     open_device(DCR *dcr);
@@ -155,8 +142,9 @@ void     handle_filed_connection(BSOCK *fd, char *job_name);
 int      read_dev_volume_label(DCR *dcr);
 int      read_dvd_volume_label(DCR *dcr, bool write);
 void     create_session_label(DCR *dcr, DEV_RECORD *rec, int label);
-void     create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName);
-bool     write_new_volume_label_to_dev(DCR *dcr, const char *VolName, const char *PoolName);
+void     create_volume_label(DEVICE *dev, const char *VolName, const char *PoolName, bool dvdnow);
+bool     write_new_volume_label_to_dev(DCR *dcr, const char *VolName, 
+           const char *PoolName, bool relabel, bool dvdnow);
 #define ANSI_VOL_LABEL 0
 #define ANSI_EOF_LABEL 1
 #define ANSI_EOV_LABEL 2
@@ -176,7 +164,7 @@ int      match_bsr(BSR *bsr, DEV_RECORD *rec, VOLUME_LABEL *volrec,
 int      match_bsr_block(BSR *bsr, DEV_BLOCK *block);
 void     position_bsr_block(BSR *bsr, DEV_BLOCK *block);
 BSR     *find_next_bsr(BSR *root_bsr, DEVICE *dev);
-bool     match_set_eof(BSR *bsr, DEV_RECORD *rec);
+bool     is_this_bsr_done(BSR *bsr, DEV_RECORD *rec);
 
 /* From mount.c */
 bool     mount_next_write_volume(DCR *dcr, bool release);
@@ -219,9 +207,9 @@ bool    free_volume(DEVICE *dev);
 void    free_unused_volume(DCR *dcr);
 void    create_volume_list();
 void    free_volume_list();
-void    list_volumes(BSOCK *user);
+void    list_volumes(void sendit(const char *msg, int len, void *sarg), void *arg);
 bool    is_volume_in_use(DCR *dcr);
-void    send_drive_reserve_messages(JCR *jcr, BSOCK *user);
+void    send_drive_reserve_messages(JCR *jcr, void sendit(const char *msg, int len, void *sarg), void *arg);
 bool    find_suitable_device_for_job(JCR *jcr, RCTX &rctx);
 int     search_res_for_device(RCTX &rctx);
 void    release_msgs(JCR *jcr);
@@ -236,7 +224,7 @@ bool    begin_attribute_spool     (JCR *jcr);
 bool    discard_attribute_spool   (JCR *jcr);
 bool    commit_attribute_spool    (JCR *jcr);
 bool    write_block_to_spool_file (DCR *dcr);
-void    list_spool_stats          (BSOCK *bs);
+void    list_spool_stats          (void sendit(const char *msg, int len, void *sarg), void *arg);
 
 /* From wait.c */
 int wait_for_sysop(DCR *dcr);