X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=server-src%2Flogfile.h;h=6c246e222cfb346e18014c14588a3964a6824f24;hb=refs%2Fheads%2Fmaster;hp=fbeda341c6421a56440e403690339063731363c8;hpb=1194fb66aa28d9929c3f2bef3cc6c1c3f40a60a4;p=debian%2Famanda

diff --git a/server-src/logfile.h b/server-src/logfile.h
index fbeda34..6c246e2 100644
--- a/server-src/logfile.h
+++ b/server-src/logfile.h
@@ -1,6 +1,7 @@
 /*
  * Amanda, The Advanced Maryland Automatic Network Disk Archiver
  * Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc.  All Rights Reserved.
  * All Rights Reserved.
  *
  * Permission to use, copy, modify, distribute, and sell this software and its
@@ -25,7 +26,7 @@
  *			   University of Maryland at College Park
  */
 /*
- * $Id: logfile.h,v 1.12 2005/11/29 22:19:08 martinea Exp $
+ * $Id: logfile.h,v 1.13 2006/05/25 01:47:20 johnfranks Exp $
  *
  * interface to logfile module
  */
@@ -46,7 +47,8 @@ typedef enum logtype_e {
     L_ERROR, L_WARNING,	L_INFO, L_SUMMARY,	 /* information messages */
     L_START, L_FINISH,				     /* start/end of run */
     L_DISK,							 /* disk */
-    L_SUCCESS, L_PARTIAL, L_FAIL, L_STRANGE,	    /* the end of a dump */
+    /* End of a dump: */
+    L_DONE, L_PART, L_PARTPARTIAL, L_SUCCESS, L_PARTIAL, L_FAIL, L_STRANGE,
     L_CHUNK, L_CHUNKSUCCESS,                            /* ... continued */
     L_STATS,						   /* statistics */
     L_MARKER,					  /* marker for reporter */
@@ -55,9 +57,10 @@ typedef enum logtype_e {
 
 typedef enum program_e {
     P_UNKNOWN, P_PLANNER, P_DRIVER, P_REPORTER, P_DUMPER, P_CHUNKER,
-    P_TAPER, P_AMFLUSH
+    P_TAPER, P_AMFLUSH, P_AMDUMP, P_AMIDXTAPED, P_AMFETCHDUMP, P_AMCHECKDUMP,
+    P_AMVAULT, P_SENTINEL
 } program_t;
-#define P_LAST P_AMFLUSH
+#define P_LAST (P_SENTINEL-1)
 
 extern char *logtype_str[];
 
@@ -67,14 +70,12 @@ extern program_t curprog;
 extern char *curstr;
 extern char *program_str[];
 
-void logerror P((char *));
-void log_add P((logtype_t typ, char * format, ...))
-    __attribute__ ((format (printf, 2, 3)));
-char* log_genstring P((logtype_t typ, char *pname, char * format, ...));
-/*    __attribute__ ((format (printf, 3, 4))); */
-void log_start_multiline P((void));
-void log_end_multiline P((void));
-void log_rename P((char *datestamp));
-int get_logline P((FILE *));
+void amanda_log_trace_log(GLogLevelFlags log_level, const gchar *message);
+void log_add(logtype_t typ, char * format, ...) G_GNUC_PRINTF(2, 3);
+void log_add_full(logtype_t typ, char *pname, char *format, ...) G_GNUC_PRINTF(3, 4);
+void log_start_multiline(void);
+void log_end_multiline(void);
+void log_rename(char *datestamp);
+int get_logline(FILE *);
 
 #endif  /* ! LOGFILE_H */