Convert restore object to use STREAM_RESTORE_OBJECT; cleaner code

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

diff --git a/bacula/src/stored/protos.h b/bacula/src/stored/protos.h
index 862a5523a5aceb7b9746633f472d7bb4b72e150a..c8563b69d7ded9de996bfbbb8561e17774ad8284 100644 (file)
--- a/bacula/src/stored/protos.h
+++ b/bacula/src/stored/protos.h
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2008 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -28,7 +28,6 @@
 /*
  * Protypes for stored -- Kern Sibbald MM  
  *
- *   Version $Id$
  */
 
 /* From stored.c */
@@ -42,6 +41,9 @@ bool     clean_device(DCR *dcr);
 DCR     *new_dcr(JCR *jcr, DCR *dcr, DEVICE *dev);
 void     free_dcr(DCR *dcr);
 
+/* From append.c */
+bool send_attrs_to_dir(JCR *jcr, DEV_RECORD *rec);
+
 /* From askdir.c */
 enum get_vol_info_rw {
    GET_VOL_INFO_FOR_WRITE,
@@ -214,9 +216,9 @@ bool read_records(DCR *dcr,
 /* From reserve.c */
 void    init_reservations_lock();
 void    term_reservations_lock();
-void    _lock_reservations();
+void    _lock_reservations(const char *file="**Unknown**", int line=0);
 void    _unlock_reservations();
-void    _lock_volumes();
+void    _lock_volumes(const char *file="**Unknown**", int line=0);
 void    _unlock_volumes();
 void    unreserve_device(DCR *dcr);
 void    send_drive_reserve_messages(JCR *jcr, void sendit(const char *msg, int len, void *sarg), void *arg);
@@ -232,7 +234,7 @@ extern int reservations_lock_count;
          do { Dmsg3(sd_dbglvl, "lock_reservations at %s:%d precnt=%d\n", \
               __FILE__, __LINE__, \
               reservations_lock_count); \
-              _lock_reservations(); \
+              _lock_reservations(__FILE__, __LINE__); \
               Dmsg0(sd_dbglvl, "lock_reservations: got lock\n"); \
          } while (0)
 #define unlock_reservations() \
@@ -245,7 +247,7 @@ extern int reservations_lock_count;
          do { Dmsg3(sd_dbglvl, "lock_volumes at %s:%d precnt=%d\n", \
               __FILE__, __LINE__, \
               vol_list_lock_count); \
-              _lock_volumes(); \
+              _lock_volumes(__FILE__, __LINE__); \
               Dmsg0(sd_dbglvl, "lock_volumes: got lock\n"); \
          } while (0)
 
@@ -257,9 +259,9 @@ extern int reservations_lock_count;
 
 #else
 
-#define lock_reservations() _lock_reservations()
+#define lock_reservations() _lock_reservations(__FILE__, __LINE__)
 #define unlock_reservations() _unlock_reservations()
-#define lock_volumes() _lock_volumes()
+#define lock_volumes() _lock_volumes(__FILE__, __LINE__)
 #define unlock_volumes() _unlock_volumes()
 
 #endif
@@ -278,7 +280,6 @@ void    create_volume_lists();
 void    free_volume_lists();
 void    list_volumes(void sendit(const char *msg, int len, void *sarg), void *arg);
 bool    is_volume_in_use(DCR *dcr);
-void    debug_list_volumes(const char *imsg);
 extern  int vol_list_lock_count;
 void    add_read_volume(JCR *jcr, const char *VolumeName);
 void    remove_read_volume(JCR *jcr, const char *VolumeName);