Changeset 34 for trunk/include

Timestamp:

May 19, 2006, 8:09:51 PM (19 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

Location:

trunk/include

Files:

• samhain.h (modified) (1 diff)
• sh_utils.h (modified) (2 diffs)
• slib.h (modified) (1 diff)

trunk/include/samhain.h

@@ -302 +302 @@
  */
 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)
 

trunk/include/sh_utils.h

@@ -144 +144 @@
 /* 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 +160 @@
 /* returns freshly allocated memory, return value should be free'd
  */
-char * sh_util_basename(char * fullpath);
+char * sh_util_basename(const char * fullpath);
 
 #endif

trunk/include/slib.h

@@ -401 +401 @@
   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
 }