Index: trunk/include/samhain.h
===================================================================
--- trunk/include/samhain.h	(revision 30)
+++ trunk/include/samhain.h	(revision 34)
@@ -302,14 +302,14 @@
  */
 int  safe_logger (int signal, int method, char * details);
-void safe_fatal  (int signal, int method, char * details, char *f, int l);
+void safe_fatal  (char * details, char *f, int l);
 
 #define SH_VALIDATE_EQ(a,b) \
      do { \
-         if ((a) != (b)) safe_fatal(0, 0, #a " != " #b, FIL__, __LINE__);\
+         if ((a) != (b)) safe_fatal(#a " != " #b, FIL__, __LINE__);\
      } while (0)
 
 #define SH_VALIDATE_NE(a,b) \
      do { \
-         if ((a) == (b)) safe_fatal(0, 0, #a " == " #b, FIL__, __LINE__);\
+         if ((a) == (b)) safe_fatal(#a " == " #b, FIL__, __LINE__);\
      } while (0)
 
Index: trunk/include/sh_utils.h
===================================================================
--- trunk/include/sh_utils.h	(revision 30)
+++ trunk/include/sh_utils.h	(revision 34)
@@ -144,5 +144,5 @@
 /* returns freshly allocated memory, return value should be free'd
  */
-char * sh_util_filename(char * fullpath);
+char * sh_util_dirname(const char * fullpath);
 
 /* returns freshly allocated memory, return value should be free'd
@@ -160,5 +160,5 @@
 /* returns freshly allocated memory, return value should be free'd
  */
-char * sh_util_basename(char * fullpath);
+char * sh_util_basename(const char * fullpath);
 
 #endif
Index: trunk/include/slib.h
===================================================================
--- trunk/include/slib.h	(revision 30)
+++ trunk/include/slib.h	(revision 34)
@@ -401,4 +401,8 @@
   int sl_ok_subi (int a, int b);
 
+  int sl_ok_muls (size_t a, size_t b);
+  int sl_ok_adds (size_t a, size_t b);
+
+
 #ifdef  __cplusplus
 }