add strings to console variables

[vg.git] / vg_platform.h

diff --git a/vg_platform.h b/vg_platform.h
index c7e178b93df5dbb8a891e52e30d09da31bc8c843..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"
 
@@ -39,12 +33,29 @@ struct vg_achievement
 #define vg_list_size( A ) (sizeof(A)/sizeof(A[0]))
 #define VG_MUST_USE_RESULT __attribute__((warn_unused_result))
 
+#include <stdio.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,
-   k_strncpy_allow_cutoff = 1
+   k_strncpy_allow_cutoff = 1,
+   k_strncpy_overflow_fatal = 2
 };
 
-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++ ){
@@ -52,66 +63,41 @@ VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
 
       if( !src[i] ) return i;
 
-      if( (behaviour == k_strncpy_always_add_null) && (i == len-1) ){
-         dst[i] = '\0';
-         return i;
+      if( i == len-1 ){
+         if( behaviour == k_strncpy_always_add_null ){
+            dst[i] = '\0';
+            return i;
+         }
+         else if( behaviour == k_strncpy_overflow_fatal ){
+            vg_fatal_error( "Strncpy dest exceeded buffer length\n" );
+         }
       }
    }
 
    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->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{
-      str->buffer[ str->i ++ ] = '\0';
-      return 1;
-   }
+   } else return 0;
 }
 
-VG_STATIC u32 vg_strdjb2( const char *str )
-{
-   u32 hash = 5381, c;
-
-   while( (c = *str++) )
-      hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+#define VG_STRDJB2_EQ( CS1, S2, H2 ) \
+   vg_strdjb2_eq( CS1, vg_strdjb2(CS1), S2, H2 )
 
-   return hash;
-}
-
-#include <stdio.h>
-#include <dirent.h>
-#include <string.h>
-#include <stdarg.h>
-#include <ctype.h>
-#include <math.h>
-#include <assert.h>
 
 #define VG_MIN( A, B ) ((A)<(B)?(A):(B))
 #define VG_MAX( A, B ) ((A)>(B)?(A):(B))