Imported Debian patch 2.5.1-1

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

diff --git a/server-src/find.h b/server-src/find.h
index c657dfc203e22c41774de1bf4b8e22891bf90789..e3f76c1ad764dbb04bb9baf15111d3762bb2c330 100644 (file)
--- a/server-src/find.h
+++ b/server-src/find.h
@@ -1,25 +1,28 @@
+#ifndef FIND_H
+#define FIND_H
 
-#define DEFAULT_SORT_ORDER      "hkdlb"
+#include "diskfile.h"
+
+#define DEFAULT_SORT_ORDER      "hkdlpb"
 
 typedef struct find_result_s {
     struct find_result_s *next;
-    int datestamp;
-    int datestamp_aux;
-        /* aux is secondary key for intra-day comparisons -- could be timestamp,
-           just use seq# */
     char *timestamp;
     char *hostname;
     char *diskname;
     int level;
     char *label;
-    int  filenum;
+    off_t filenum;
     char *status;
+    char *partnum;
+    void *user_ptr;
 } find_result_t;
 
-find_result_t *find_dump P((int dyna_disklist, disklist_t* diskqp));
-char **find_log P(());
-void sort_find_result P((char *sort_order, find_result_t **output_find));
-void print_find_result P((find_result_t *output_find));
-void free_find_result P((find_result_t **output_find));
-find_result_t *dump_exist P((find_result_t *output_find, char *hostname, char *diskname, int datestamp, int level));
-
+find_result_t *find_dump(int dyna_disklist, disklist_t* diskqp);
+char **find_log(void);
+void sort_find_result(char *sort_order, find_result_t **output_find);
+void print_find_result(find_result_t *output_find);
+void free_find_result(find_result_t **output_find);
+find_result_t *dump_exist(find_result_t *output_find, char *hostname, char *diskname, char *datestamp, int level);
+find_result_t *dumps_match(find_result_t *output_find, char *hostname, char *diskname, char *datestamp, char *level, int ok);
+#endif /* !FIND_H */