Imported Upstream version 2.6.1

[debian/amanda] / client-src / sendbackup.h

diff --git a/client-src/sendbackup.h b/client-src/sendbackup.h
index 134e6fb65bf084489d37b1005cfbe976e60aa1ae..ceff2d96fae9eba51f99d8a733c4fa9ea5de39be 100644 (file)
--- a/client-src/sendbackup.h
+++ b/client-src/sendbackup.h
@@ -36,7 +36,7 @@
 #include "client_util.h"
 #include "amandad.h"
 
-void info_tapeheader(void);
+void info_tapeheader(dle_t *dle);
 void start_index(int createindex, int input, int mesg, 
                    int index, char *cmd);
 
@@ -57,7 +57,7 @@ void start_index(int createindex, int input, int mesg,
  */
 
 typedef enum { 
-    DMP_NORMAL, DMP_STRANGE, DMP_SIZE, DMP_ERROR
+    DMP_NORMAL, DMP_IGNORE, DMP_STRANGE, DMP_SIZE, DMP_ERROR
 } dmpline_t;
 
 typedef struct regex_s {
@@ -69,20 +69,20 @@ typedef struct regex_s {
 } amregex_t;
 
 #define AM_NORMAL_RE(re)       {(re), __LINE__, 0, 0, DMP_NORMAL}
+#define AM_IGNORE_RE(re)       {(re), __LINE__, 0, 0, DMP_IGNORE}
 #define AM_STRANGE_RE(re)      {(re), __LINE__, 0, 0, DMP_STRANGE}
 #define AM_SIZE_RE(re,s,f)     {(re), __LINE__, (s), (f), DMP_SIZE}
 #define AM_ERROR_RE(re)                {(re), __LINE__, 0, 0, DMP_ERROR}
 
 extern pid_t  comppid, dumppid, encpid, tarpid;
 extern pid_t indexpid;
-extern option_t *options;
 extern g_option_t *g_options;
 
 typedef struct backup_program_s {
     char *name, *backup_name, *restore_name;
     amregex_t *re_table;
-    void (*start_backup)(char *host, char *disk, char *amdevice, int level, char *dumpdate, int dataf, int mesgf, int indexf);
-    void (*end_backup)(int goterror);
+    void (*start_backup)(dle_t *dle, char *host, int dataf, int mesgf, int indexf);
+    void (*end_backup)(dle_t *dle, int goterror);
 } backup_program_t;
 
 extern backup_program_t *programs[], *program;