X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_platform.h;h=30751f2817ec0dde038948a89d2b68182d65d5f3;hb=76d234b7dc5e6500e8a54009b367e7620f11ef97;hp=cb861941142f0d56e790042722419ebc19e5c6cd;hpb=4fd349df690629d8404fd355154846eace921586;p=vg.git

diff --git a/vg_platform.h b/vg_platform.h
index cb86194..30751f2 100644
--- a/vg_platform.h
+++ b/vg_platform.h
@@ -1,12 +1,6 @@
 #ifndef VG_PLATFORM_H
 #define VG_PLATFORM_H
 
-#ifdef VG_RELEASE
- #define VG_STATIC static
-#else
- #define VG_STATIC
-#endif
-
 //#include "vg.h"
 #include "vg_stdint.h"
 
@@ -40,12 +34,16 @@ struct vg_achievement
 #define VG_MUST_USE_RESULT __attribute__((warn_unused_result))
 
 #include <stdio.h>
-#include <dirent.h>
 #include <string.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <math.h>
 #include <assert.h>
+#include <setjmp.h>
+#include <sys/time.h>
+#include <math.h>
+#include <stdio.h>
+#include <errno.h>
 
 enum strncpy_behaviour{
    k_strncpy_always_add_null = 0,
@@ -53,8 +51,8 @@ enum strncpy_behaviour{
    k_strncpy_overflow_fatal = 2
 };
 
-VG_STATIC void vg_fatal_error( const char *fmt, ... );
-VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
+static void vg_fatal_error( const char *fmt, ... );
+static u32 vg_strncpy( const char *src, char *dst, u32 len,
                           enum strncpy_behaviour behaviour )
 {
    for( u32 i=0; i<len; i++ ){
@@ -82,15 +80,17 @@ struct vg_str{
    u32 i, len;
 };
 
-VG_STATIC void vg_strnull( vg_str *str, char *buffer, u32 len )
+static void vg_strnull( vg_str *str, char *buffer, u32 len )
 {
    str->buffer = buffer;
+   str->buffer[0] = '\0';
    str->i = 0;
    str->len = len;
 }
 
-VG_STATIC void vg_strcat( vg_str *str, const char *append )
+static void vg_strcat( vg_str *str, const char *append )
 {
+   if( !append ) return;
    for( u32 i=0; str->i < str->len; i++, str->i ++ ){
       str->buffer[ str->i ] = append[i];
 
@@ -98,7 +98,7 @@ VG_STATIC void vg_strcat( vg_str *str, const char *append )
    }
 }
 
-VG_STATIC int vg_strgood( vg_str *str )
+static int vg_strgood( vg_str *str )
 {
    if( str->i == str->len ){
       if( str->buffer[str->i -1] == '\0' ) return 1;
@@ -107,7 +107,7 @@ VG_STATIC int vg_strgood( vg_str *str )
    else return 1;
 }
 
-VG_STATIC char *vg_strch( vg_str *str, char c )
+static char *vg_strch( vg_str *str, char c )
 {
    char *ptr = NULL;
    for( u32 i=0; i<str->i; i++ ){
@@ -118,7 +118,7 @@ VG_STATIC char *vg_strch( vg_str *str, char c )
    return ptr;
 }
 
-VG_STATIC u32 vg_strdjb2( const char *str )
+static u32 vg_strdjb2( const char *str )
 {
    u32 hash = 5381, c;
 
@@ -128,6 +128,19 @@ VG_STATIC u32 vg_strdjb2( const char *str )
    return hash;
 }
 
+static int vg_strdjb2_eq( const char *s1, u32 h1, 
+                             const char *s2, u32 h2 )
+{
+   if( h1 == h2 ){
+      if(!strcmp(s1, s2)) return 1;
+      else return 0;
+   } else return 0;
+}
+
+#define VG_STRDJB2_EQ( CS1, S2, H2 ) \
+   vg_strdjb2_eq( CS1, vg_strdjb2(CS1), S2, H2 )
+
+
 #define VG_MIN( A, B ) ((A)<(B)?(A):(B))
 #define VG_MAX( A, B ) ((A)>(B)?(A):(B))
 #endif