Imported Upstream version 3.2.0

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

diff --git a/server-src/logfile.h b/server-src/logfile.h
index ed5934728ad1120ff623a49c7e873af146de6884..409fb480a3e5737f108686782b2e297343545149 100644 (file)
--- a/server-src/logfile.h
+++ b/server-src/logfile.h
@@ -46,7 +46,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 +56,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,11 +69,9 @@ extern program_t curprog;
 extern char *curstr;
 extern char *program_str[];
 
-void logerror(char *);
-void log_add(logtype_t typ, char * format, ...)
-    __attribute__ ((format (printf, 2, 3)));
-char* log_genstring(logtype_t typ, char *pname, char * format, ...);
-/*    __attribute__ ((format (printf, 3, 4))); */
+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);