Merge branch 'master' into squeeze

[debian/amanda] / server-src / holding.h

diff --git a/server-src/holding.h b/server-src/holding.h
index 8c465ac83fefd58e216884e49e7b66bec4426fbb..d8f992ac219e7a8f914d0be2fe1efb5357d9dfb9 100644 (file)
--- a/server-src/holding.h
+++ b/server-src/holding.h
@@ -38,11 +38,11 @@
  *
  * Example:
  *
- * /data/holding                                     <-- holding disk
- * /data/holding/200703061234                        <-- holding dir
- * /data/holding/200703061234/videoserver._video_a   <-- holding file,
-                                                         holding file chunk
- * /data/holding/200703061234/videoserver._video_a.1 <-- holding file chunk
+ * /data/holding                                       <-- holding disk
+ * /data/holding/20070306123456                        <-- holding dir
+ * /data/holding/20070306123456/videoserver._video_a   <-- holding file,
+                                                           holding file chunk
+ * /data/holding/20070306123456/videoserver._video_a.1 <-- holding file chunk
  *
  */
 
@@ -50,7 +50,6 @@
 #define HOLDING_H
 
 #include "amanda.h"
-#include "diskfile.h"
 #include "fileheader.h"
 
 /* Get a list of holding disks.  This is equivalent to 
@@ -83,8 +82,8 @@ GSList *
 holding_get_file_chunks(char *hfile);
 
 /* Get a list of holding files that should be flushed, optionally
- * matching only certain datestamps.  This function filters out
- * files for host/disks that are no longer in the disklist.
+ * matching only certain datestamps.  This function does *not*
+ * match the dumps against the disklist.
  *
  * @param dateargs: GSList of datestamps expressions to dump, or NULL 
  * for all
@@ -160,6 +159,14 @@ holding_cleanup(corrupt_dle_fn corrupt_dle,
  * application-specific support
  */
 
+/* Set the orig_size in the header
+ *
+ * @param holding_file: full pathname of holding file.
+ * @param orig_size: the size.
+ */
+void
+holding_set_origsize(char *holding_file, off_t orig_size);
+
 /* Rename holding files from the temporary names used during
  * creation.
  *