X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=client-src%2Fsendbackup.h;h=15f237d6178a9d77facfc90e1be7a37666b02bd7;hb=fd48f3e498442f0cbff5f3606c7c403d0566150e;hp=ee2a836a0af3b97008ed93a3c00e6179ddf800f5;hpb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;p=debian%2Famanda

diff --git a/client-src/sendbackup.h b/client-src/sendbackup.h
index ee2a836..15f237d 100644
--- a/client-src/sendbackup.h
+++ b/client-src/sendbackup.h
@@ -24,17 +24,21 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /* 
- * $Id: sendbackup.h,v 1.18 2005/12/09 03:22:52 paddy_s Exp $
+ * $Id: sendbackup.h,v 1.20 2006/07/25 18:10:07 martinea Exp $
  *
  * a few common decls for the sendbackup-* sources
  */
+#ifndef SENDBACKUP_H
+#define SENDBACKUP_H
+
 #include "amanda.h"
 #include "pipespawn.h"
 #include "client_util.h"
+#include "amandad.h"
 
-void info_tapeheader P((void));
-void start_index P((int createindex, int input, int mesg, 
-		    int index, char *cmd));
+void info_tapeheader(dle_t *dle);
+void start_index(int createindex, int input, int mesg, 
+		    int index, char *cmd);
 
 /*
  * Dump output lines are scanned for two types of regex matches.
@@ -52,33 +56,17 @@ void start_index P((int createindex, int input, int mesg,
  * multiplied by the scale field to get the dump size.
  */
 
-typedef enum { 
-    DMP_NORMAL, DMP_STRANGE, DMP_SIZE, DMP_ERROR
-} dmpline_t;
-
-typedef struct regex_s {
-    char *regex;
-    int srcline;
-    int scale;                  /* only used for size lines */
-    dmpline_t typ;
-} regex_t;
-
-#define AM_NORMAL_RE(re)	{(re), __LINE__, 0, DMP_NORMAL}
-#define AM_STRANGE_RE(re)	{(re), __LINE__, 0, DMP_STRANGE}
-#define AM_SIZE_RE(re,s)	{(re), __LINE__, (s), DMP_SIZE}
-#define AM_ERROR_RE(re)		{(re), __LINE__, 0, DMP_ERROR}
-
-extern int  comppid, dumppid, encpid, tarpid;
-extern int indexpid;
-extern option_t *options;
+extern pid_t  comppid, dumppid, encpid, tarpid;
+extern pid_t indexpid;
+extern g_option_t *g_options;
 
 typedef struct backup_program_s {
     char *name, *backup_name, *restore_name;
-    regex_t *re_table;
-    void (*start_backup) P((char *host, char *disk, char *amdevice, int level, char *dumpdate, 
-			    int dataf, int mesgf, int indexf));
-    void (*end_backup) P((int goterror));
+    amregex_t *re_table;
+    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;
 
+#endif	/* !SENDBACKUP_H */