Changeset 214 for trunk/include

Timestamp:

Feb 17, 2009, 10:54:26 PM (16 years ago)

Author:

katerina

Message:

Rewrite mail subsystem for more flexibility (closes ticket #141).

Location:

trunk/include

Files:

• sh_fifo.h (modified) (5 diffs)
• sh_mail.h (modified) (1 diff)
• sh_pthread.h (modified) (2 diffs)
• sh_utils.h (modified) (2 diffs)
• slib.h (modified) (1 diff)

trunk/include/sh_fifo.h

@@ -10 +10 @@
  *****************************************************/
 
-#define SH_FIFO_MAX 128
+#define SH_FIFO_MAX 16384
 
 /*****************************************************
@@ -21 +21 @@
   struct dlist * next;
   char         * data;
+  char         * s_xtra;
+  int            i_xtra;
+  int            transact;
   struct dlist * prev;
 };
@@ -47 +50 @@
  * Returns: -1 if the list is full, 0 on success 
  */
-int push_list (SH_FIFO * fifo, char * indat);
+int push_list (SH_FIFO * fifo, char * indat, int in_i, const char * in_str);
 
 /* Push an item on the tail of the list.
@@ -53 +56 @@
  * Returns: -1 if the list is full, 0 on success 
  */
-int push_tail_list (SH_FIFO * fifo, char * indat);
+int push_tail_list (SH_FIFO * fifo, char * indat, int in_i, const char * in_str);
 
 /* pop an item from the tail of the list
@@ -62 +65 @@
 char * pop_list (SH_FIFO * fifo);
 
+
+sh_string * tag_list (SH_FIFO * fifo, char * tag,
+                      int(*check)(int, const char*, const char*, const void*),
+                      const void * info);
+void rollback_list (SH_FIFO * fifo);
+void mark_list (SH_FIFO * fifo);
+void reset_list (SH_FIFO * fifo);
+int commit_list (SH_FIFO * fifo);
+
 #endif

trunk/include/sh_mail.h

@@ -52 +52 @@
 /* call if not urgent
  */
-int sh_mail_pushstack (/*@null@*/char * msg);
-
-/* call if mail immediate
- */
-int sh_mail_msg (/*@null@*/char * message);
+int sh_mail_pushstack (int severity, const char * msg, const char * alias);
 
 /* set sender of mail

trunk/include/sh_pthread.h

@@ -30 +30 @@
 
 #define SH_MUTEX_LOCK_UNSAFE(M) pthread_mutex_lock(&(M))
+#define SH_MUTEX_TRYLOCK_UNSAFE(M) pthread_mutex_trylock(&(M))
 #define SH_MUTEX_UNLOCK_UNSAFE(M) pthread_mutex_unlock(&(M))
 
@@ -140 +141 @@
 #define SH_MUTEX_UNLOCK(M)                      ((void)0)
 #define SH_MUTEX_LOCK_UNSAFE(M)                 ((void)0)
+#define SH_MUTEX_TRYLOCK_UNSAFE(M)              (0)
 #define SH_MUTEX_UNLOCK_UNSAFE(M)               ((void)0)
 

trunk/include/sh_utils.h

@@ -40 +40 @@
   unsigned long   data_ulong;
   long            data_long;
-  /*@null@*/char *data_str;
+  char           *data_str;
 } st_format;
 
@@ -131 +131 @@
 /* a simple compressor
  */
-long sh_util_compress (char * dest, char * src, size_t dest_size);
+size_t sh_util_compress (char * dest, char * src, size_t dest_size);
 
 /* an even simpler en-/decoder 

trunk/include/slib.h

@@ -203 +203 @@
    * strstr
    */
-  const char * sl_strstr (const char * haystack, const char * needle); 
+  char * sl_strstr (const char * haystack, const char * needle); 
 
   /*