compiler warnings

[vg.git] / vg_platform.h

diff --git a/vg_platform.h b/vg_platform.h
index 1b0317c0c30b0b43ff971fa97c01370eb89987de..8bdd0991b8e245537120989774b378aa0549b50a 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"
 
@@ -57,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++ ){
@@ -83,40 +77,80 @@ VG_STATIC u32 vg_strncpy( const char *src, char *dst, u32 len,
 typedef struct vg_str vg_str;
 struct vg_str{
    char *buffer;
-   u32 i, len;
+   i32 i, len;
 };
 
-VG_STATIC void vg_strnull( vg_str *str, char *buffer, u32 len )
-{
+static void vg_strnull( vg_str *str, char *buffer, i32 len ){
    str->buffer = buffer;
    str->buffer[0] = '\0';
    str->i = 0;
    str->len = len;
+
+   assert(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];
+   if( str->i == -1 ) return;
+
+   for( u32 i=0; str->i < str->len; str->i ++, i ++ ){
+      str->buffer[ str->i ] = append[ i ];
 
-      if( append[i] == '\0' ) return;
+      if( append[ i ] == '\0' )
+         return;
    }
+
+   /* overflow */
+   str->buffer[ str->len-1 ] = '\0';
+   str->i = -1;
 }
 
-VG_STATIC int vg_strgood( vg_str *str )
-{
-   if( str->i == str->len ){
-      if( str->buffer[str->i -1] == '\0' ) return 1;
-      else return 0;
+static void vg_strcati32( vg_str *str, i32 value ){
+   if( value ){
+      char temp[32];
+      int i=0;
+      while( value && (i<31) ){
+         temp[ i ++ ] = '0' + (value % 10);
+         value /= 10;
+      }
+
+      char reverse[32];
+      for( int j=0; j<i; j ++ )
+         reverse[j] = temp[ i-1-j ];
+      reverse[i] = '\0';
+
+      vg_strcat( str, reverse );
+   }
+   else
+      vg_strcat( str, "0" );
+}
+
+static void vg_strcati32r( vg_str *str, i32 value, i32 n, char alt ){
+   char temp[32];
+   i32 i=0;
+   while( value ){
+      if( i>=n ) 
+         break;
+
+      temp[ n-1 - (i ++) ] = '0' + (value % 10);
+      value /= 10;
    }
+
+   for( ;i<n; i ++ )
+      temp[ n-1 - i ] = alt;
+
+   temp[n]='\0';
+   vg_strcat( str, temp );
+}
+
+static int vg_strgood( vg_str *str ){
+   if( str->i == -1 ) return 0;
    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++ ){
+   for( i32 i=0; i<str->i; i++ ){
       if( str->buffer[i] == c )
          ptr = str->buffer+i;
    }
@@ -124,8 +158,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;
 
    while( (c = *str++) )
@@ -134,7 +167,7 @@ VG_STATIC u32 vg_strdjb2( const char *str )
    return hash;
 }
 
-VG_STATIC int vg_strdjb2_eq( const char *s1, u32 h1, 
+static int vg_strdjb2_eq( const char *s1, u32 h1, 
                              const char *s2, u32 h2 )
 {
    if( h1 == h2 ){