const char * additions

[bacula/bacula] / bacula / src / lib / message.h

diff --git a/bacula/src/lib/message.h b/bacula/src/lib/message.h
index 06b248e1c550eef565cf667a04ac11b05ca8d775..f891802341964cbf5ee47e6c6828b66c294ad99d 100644 (file)
--- a/bacula/src/lib/message.h
+++ b/bacula/src/lib/message.h
@@ -36,6 +36,7 @@
 #undef  M_ERROR_TERM
 #undef  M_TERM
 #undef  M_RESTORED
+#undef  M_SECURITY
 
 /*
  * Most of these message levels are more or less obvious. 
@@ -61,23 +62,29 @@
  *
  *  M_RESTORED    An ls -l of each restored file.
  *
+ *  M_SECURITY    For security viloations. This is equivalent to FATAL.
+ *                (note, this is currently being implemented in 1.33).
+ *
  */
 
-#define M_DEBUG       1               /* debug message */
-#define M_ABORT       2               /* MUST abort immediately */
-#define M_FATAL       3               /* Fatal error, stopping job */
-#define M_ERROR       4               /* Error, but recoverable */
-#define M_WARNING     5               /* Warning message */
-#define M_INFO        6               /* Informational message */
-#define M_SAVED       7               /* Info on saved file */
-#define M_NOTSAVED    8               /* Info on notsaved file */
-#define M_SKIPPED     9               /* File skipped by option setting */
-#define M_MOUNT      10               /* Mount requests */
-#define M_ERROR_TERM 11               /* Error termination request (no dump) */
-#define M_TERM       12               /* Terminating daemon */
-#define M_RESTORED   13               /* ls -l of restored files */
+enum {
+   M_DEBUG = 1,                       /* debug message */
+   M_ABORT,                           /* MUST abort immediately */
+   M_FATAL,                           /* Fatal error, stopping job */
+   M_ERROR,                           /* Error, but recoverable */
+   M_WARNING,                         /* Warning message */
+   M_INFO,                            /* Informational message */
+   M_SAVED,                           /* Info on saved file */
+   M_NOTSAVED,                        /* Info on notsaved file */
+   M_SKIPPED,                         /* File skipped during backup by option setting */
+   M_MOUNT,                           /* Mount requests */
+   M_ERROR_TERM,                      /* Error termination request (no dump) */
+   M_TERM,                            /* Terminating daemon normally */
+   M_RESTORED,                        /* ls -l of restored files */
+   M_SECURITY,                        /* security violation */
+};
 
-#define M_MAX      M_RESTORED         /* keep this updated ! */
+#define M_MAX      M_SECURITY         /* keep this updated ! */
 
 /* Define message destination structure */
 /* *** FIXME **** where should be extended to handle multiple values */
@@ -104,10 +111,18 @@ typedef struct s_dest {
 #define MD_CONSOLE   9                /* send msg to UserAgent or console */
 #define MD_MAIL_ON_ERROR 10           /* email messages if job errors */
 
+/* Queued message item */
+struct MQUEUE_ITEM {
+   dlink link;
+   int type;
+   int level;
+   char msg[1];
+};
+
 
-void d_msg(char *file, int line, int level, char *fmt,...);
-void e_msg(char *file, int line, int type, int level, char *fmt,...);
-void Jmsg(JCR *jcr, int type, int level, char *fmt,...);
+void d_msg(const char *file, int line, int level, const char *fmt,...);
+void e_msg(const char *file, int line, int type, int level, const char *fmt,...);
+void Jmsg(JCR *jcr, int type, int level, const char *fmt,...);
 
 extern int debug_level;
 extern int verbose;