Imported Upstream version 2.5.1

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

diff --git a/server-src/server_util.h b/server-src/server_util.h
index 34f7125fe464272c1ffb9324ccacaf3a028ba5a9..7087231bb4695b331fc7f831b98ed4995a4d4dd4 100644 (file)
--- a/server-src/server_util.h
+++ b/server-src/server_util.h
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /*
- * $Id: server_util.h,v 1.8.2.1 2006/04/23 18:52:04 martinea Exp $
+ * $Id: server_util.h,v 1.11 2006/05/25 01:47:20 johnfranks Exp $
  *
  */
 #ifndef SERVER_UTIL_H
@@ -34,7 +34,12 @@
 
 #define MAX_ARGS 32
 
-typedef enum {
+/*
+ * Some lints are confused by: typedef enum (...) xxx_t;
+ * So here we use an equivalent of type int and an unnamed enum for constants.
+ */
+typedef int cmd_t;
+enum {
     BOGUS, QUIT, QUITTING, DONE, PARTIAL,
     START, FILE_DUMP, PORT_DUMP, CONTINUE, ABORT,      /* dumper cmds */
     FAILED, TRYAGAIN, NO_ROOM, RQ_MORE_DISK,           /* dumper results */
@@ -43,7 +48,7 @@ typedef enum {
     PORT, TAPE_ERROR, TAPER_OK,        SPLIT_NEEDNEXT,         /* taper results */
     SPLIT_CONTINUE,
     LAST_TOK
-} cmd_t;
+};
 extern const char *cmdstr[];
 
 struct cmdargs {
@@ -51,8 +56,19 @@ struct cmdargs {
     char *argv[MAX_ARGS + 1];
 };
 
-cmd_t getcmd P((struct cmdargs *cmdargs));
-void putresult P((cmd_t result, const char *, ...))
+cmd_t getcmd(struct cmdargs *cmdargs);
+cmd_t getresult(int fd, int show, int *result_argc, char **result_argv, int max_arg);
+void putresult(cmd_t result, const char *, ...)
      __attribute__ ((format (printf, 2, 3)));
+int taper_cmd(cmd_t cmd, void *ptr, char *destname, int level, char *datestamp);
+
+struct disk_s;
+struct chunker_s;
+int chunker_cmd(struct chunker_s *chunker, cmd_t cmd, struct disk_s *dp);
+
+struct dumper_s;
+int dumper_cmd(struct dumper_s *dumper, cmd_t cmd, struct disk_s *dp);
+
+char *amhost_get_security_conf(char *string, void *arg);
 
 #endif /* SERVER_UTIL_H */