X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_platform.h;h=e8b288e9731afd4034d922ff010a5ed3e4054700;hb=5cc37bf42297227603b045317af94952fff07bf3;hp=9366095cc702e3026a16c74efc38b8e30f9750b2;hpb=4bfaf318265027e52181b2447c7d9497d68d2b54;p=vg.git

diff --git a/vg_platform.h b/vg_platform.h
index 9366095..e8b288e 100644
--- a/vg_platform.h
+++ b/vg_platform.h
@@ -46,6 +46,8 @@ struct vg_achievement
 #include <errno.h>
 #include <stdlib.h>
 
+#include "vg_string.h"
+
 enum strncpy_behaviour{
    k_strncpy_always_add_null = 0,
    k_strncpy_allow_cutoff = 1,
@@ -75,181 +77,6 @@ static u32 vg_strncpy( const char *src, char *dst, u32 len,
    return 0;
 }
 
-typedef struct vg_str vg_str;
-typedef struct vg_str_dynamic vg_str_dynamic;
-
-struct vg_str{
-   char *buffer;
-   i32 i,   /* -1: error condition. otherwise, current cursor position */
-       len; /* -1: dynamically allocated. otherwise, buffer length */
-};
-
-struct vg_str_dynamic {
-   i32 len;
-};
-
-/* 
- * Returns the current storage size of the string
- */
-static i32 vg_str_storage( vg_str *str ){
-   if( str->len == -1 ){
-      if( str->buffer ){
-         vg_str_dynamic *arr = (vg_str_dynamic *)str->buffer;
-         return (arr-1)->len;
-      }
-      else return 0;
-   }
-   else return str->len;
-}
-
-/*
- * Reset string. If len is -1 (dynamically allocated), buffer must be either 
- * NULL or be acquired from malloc or realloc
- */
-static void vg_strnull( vg_str *str, char *buffer, i32 len ){
-   str->buffer = buffer;
-   if( buffer )
-      str->buffer[0] = '\0';
-
-   str->i = 0;
-   str->len = len;
-
-   assert(len);
-}
-
-static void vg_strfree( vg_str *str ){
-   if( str->len == -1 ){
-      if( str->buffer ){
-         vg_str_dynamic *arr = (vg_str_dynamic *)str->buffer;
-         free( arr-1 );
-
-         str->buffer = NULL;
-         str->i = 0;
-      }
-   }
-}
-
-/*
- * Double the size of the dynamically allocated string. If unallocated, alloc of
- * 16 bytes minimum.
- */
-static i32 vg_str_dynamic_grow( vg_str *str ){
-   if( str->buffer ){
-      vg_str_dynamic *hdr = ((vg_str_dynamic *)str->buffer) - 1;
-      i32 total = (hdr->len + sizeof(vg_str_dynamic)) * 2;
-      hdr = realloc( hdr, total );
-      hdr->len = total - sizeof(vg_str_dynamic);
-      str->buffer = (char *)(hdr+1);
-      return hdr->len;
-   }
-   else {
-      vg_str_dynamic *hdr = malloc(16);
-      hdr->len = 16-sizeof(vg_str_dynamic);
-      str->buffer = (char *)(hdr+1);
-      str->buffer[0] = '\0';
-      return hdr->len;
-   }
-}
-
-/*
- * Append null terminated string to vg_str 
- */
-static void vg_strcat( vg_str *str, const char *append ){
-   if( !append || (str->i == -1) ) return;
-
-   i32 max = vg_str_storage( str ),
-       i   = 0;
-
-append:
-   if( str->i == max ){
-      if( str->len == -1 )
-         max = vg_str_dynamic_grow( str );
-      else{
-         str->i = -1;
-         str->buffer[ max-1 ] = '\0';
-         return;
-      }
-   }
-
-   char c = append[ i ++ ];
-   str->buffer[ str->i ] = c;
-
-   if( c == '\0' )
-      return;
-
-   str->i ++;
-   goto append;
-}
-
-/* 
- * Append character to vg_str 
- */
-static void vg_strcatch( vg_str *str, char c ){
-   vg_strcat( str, (char[]){ c, '\0' } );
-}
-
-/* 
- * FIXME: Negative numbers
- */
-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 );
-}
-
-/*
- * Returns 1 if string did not overflow while building
- */
-static int vg_strgood( vg_str *str ){
-   if( str->i == -1 ) return 0;
-   else return 1;
-}
-
-/*
- * Returns pointer to last instance of character
- */
-static char *vg_strch( vg_str *str, char c ){
-   char *ptr = NULL;
-   for( i32 i=0; i<str->i; i++ ){
-      if( str->buffer[i] == c )
-         ptr = str->buffer+i;
-   }
-
-   return ptr;
-}
-
 static u32 vg_strdjb2( const char *str ){
    u32 hash = 5381, c;