Changeset 272 for trunk/include

Timestamp:

Jan 27, 2010, 10:52:20 PM (15 years ago)

Author:

katerina

Message:

Fixes tickets #190, #191, #192, #193, and #194.

Location:

trunk/include

Files:

• sh_error_min.h (modified) (1 diff)
• sh_fifo.h (modified) (1 diff)
• sh_log_evalrule.h (modified) (2 diffs)
• sh_mail_int.h (modified) (1 diff)
• slib.h (modified) (1 diff)

trunk/include/sh_error_min.h

@@ -25 +25 @@
                       long errnum, unsigned long  msg_index, ...);
 
+/* this function should be called to (only) send mail
+ */
+void sh_error_mail (const char * alias, int sev, 
+                    const char * file, long line, 
+                    long status, unsigned long msg_id, ...);
+
 /* convert a string to a numeric priority
  */ 

trunk/include/sh_fifo.h

@@ -68 +68 @@
 sh_string * tag_list (SH_FIFO * fifo, char * tag,
                       int(*check)(int, const char*, const char*, const void*),
-                      const void * info);
+                      const void * info, int okNull);
 void rollback_list (SH_FIFO * fifo);
 void mark_list (SH_FIFO * fifo);

trunk/include/sh_log_evalrule.h

@@ -49 +49 @@
   enum policies     policy;
   int               severity;
+  sh_string       * alias;
   time_t            interval;        /* if EVAL_SUM, interval   */ 
   struct sh_qeval * next;
@@ -56 +57 @@
 
 int sh_log_lookup_severity(const char * str);
+sh_string * sh_log_lookup_alias(const char * str);
 
 #endif

trunk/include/sh_mail_int.h

@@ -25 +25 @@
   dnsrep           * mx_list;
   int                severity;
-  int                send_mail;
+  short              send_mail;
+  short              isAlias;
   sh_filter_type   * mail_filter;
   struct alias     * next;

trunk/include/slib.h

@@ -220 +220 @@
 
   /*
-   * robust strncmp replacement
+   * robust strn[case]cmp replacement
    */
   int sl_strncmp(const char * a, const char * b, size_t n);
+
+  int sl_strncasecmp(const char * a, const char * b, size_t n);
 
   /*