add strings to console variables

[vg.git] / vg_platform.h

diff --git a/vg_platform.h b/vg_platform.h
index b04ce672b9afa8d0803dec16dffb7f5bcbc48c77..e8b288e9731afd4034d922ff010a5ed3e4054700 100644 (file)
--- 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,19 @@ 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>
+#include <stdlib.h>
+
+#include "vg_string.h"
 
 enum strncpy_behaviour{
    k_strncpy_always_add_null = 0,
@@ -53,8 +54,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++ ){
@@ -76,58 +77,27 @@ VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
    return 0;
 }
 
-typedef struct vg_str vg_str;
-struct vg_str{
-   char *buffer;
-   u32 i, len;
-};
-
-VG_STATIC void vg_strnull( vg_str *str, char *buffer, u32 len )
-{
-   str->buffer = buffer;
-   str->buffer[0] = '\0';
-   str->i = 0;
-   str->len = len;
-}
+static u32 vg_strdjb2( const char *str ){
+   u32 hash = 5381, c;
 
-VG_STATIC void vg_strcat( vg_str *str, const char *append )
-{
-   for( u32 i=0; str->i < str->len; i++, str->i ++ ){
-      str->buffer[ str->i ] = append[i];
+   while( (c = *str++) )
+      hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
 
-      if( append[i] == '\0' ) return;
-   }
+   return hash;
 }
 
-VG_STATIC int vg_strgood( vg_str *str )
+static int vg_strdjb2_eq( const char *s1, u32 h1, 
+                             const char *s2, u32 h2 )
 {
-   if( str->i == str->len ){
-      if( str->buffer[str->i -1] == '\0' ) return 1;
+   if( h1 == h2 ){
+      if(!strcmp(s1, s2)) return 1;
       else return 0;
-   }
-   else return 1;
-}
-
-VG_STATIC char *vg_strch( vg_str *str, char c )
-{
-   char *ptr = NULL;
-   for( u32 i=0; i<str->i; i++ ){
-      if( str->buffer[i] == c )
-         ptr = str->buffer+i;
-   }
-
-   return ptr;
+   } else return 0;
 }
 
-VG_STATIC u32 vg_strdjb2( const char *str )
-{
-   u32 hash = 5381, c;
+#define VG_STRDJB2_EQ( CS1, S2, H2 ) \
+   vg_strdjb2_eq( CS1, vg_strdjb2(CS1), S2, H2 )
 
-   while( (c = *str++) )
-      hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-
-   return hash;
-}
 
 #define VG_MIN( A, B ) ((A)<(B)?(A):(B))
 #define VG_MAX( A, B ) ((A)>(B)?(A):(B))