Procházet zdrojové kódy

Fixed compiler warnings.

Brucey před 4 roky
rodič
revize
c38cf396d1
2 změnil soubory, kde provedl 38 přidání a 42 odebrání
  1. 12 18
      blitz.mod/blitz_app.c
  2. 26 24
      blitz.mod/blitz_array.c

+ 12 - 18
blitz.mod/blitz_app.c

@@ -22,14 +22,14 @@ void bbOnEnd( void (*f)() ){
 }
 
 void bbWriteStdout( BBString *t ){
-	char *p=bbStringToUTF8String( t );
+	char *p=(char*)bbStringToUTF8String( t );
 	fprintf( stdout,"%s",p );
 	fflush( stdout );
 	bbMemFree(p);
 }
 
 void bbWriteStderr( BBString *t ){
-	char *p=bbStringToUTF8String( t );
+	char *p=(char*)bbStringToUTF8String( t );
 	fprintf( stderr,"%s",p );
 	fflush( stderr );
 	bbMemFree(p);
@@ -46,7 +46,7 @@ BBString *bbReadStdin(){
 		char buf[BUF_SIZE],*p;
 		fgets( buf,BUF_SIZE,stdin );
 		buf[BUF_SIZE-1]=0;
-		if( p=strchr( buf,'\n' ) ){
+		if( (p=strchr( buf,'\n' )) ){
 			t_sz=p-buf;
 			if( t_sz && isspace(buf[t_sz-1]) ) --t_sz;
 		}else{
@@ -57,7 +57,7 @@ BBString *bbReadStdin(){
 		sz+=t_sz;
 		if( t_sz<BUF_SIZE-1 ) break;
 	}
-	if( sz ) t=bbStringFromBytes( str,sz );
+	if( sz ) t=bbStringFromBytes( (unsigned char*)str,sz );
 	else t=&bbEmptyString;
 	bbMemFree( str );
 	return t;
@@ -132,17 +132,17 @@ int bbMilliSecs(){
 }
 
 void bbUDelay( int microseconds ) {
-	__int64 time1 = 0;
-	__int64 time2 = 0;
-	__int64 freq = 0;
+	LARGE_INTEGER time1;
+	LARGE_INTEGER time2;
+	LARGE_INTEGER freq;
 
-	QueryPerformanceCounter((LARGE_INTEGER *) &time1);
+	QueryPerformanceCounter(&time1);
 	QueryPerformanceFrequency(&freq);
 
 	do {
 		Sleep(0);
-		QueryPerformanceCounter((LARGE_INTEGER *) &time2);
-	} while(time2-time1 < microseconds*freq/1000000);
+		QueryPerformanceCounter(&time2);
+	} while(time2.QuadPart-time1.QuadPart < microseconds*freq.QuadPart/1000000);
 }
 
 int bbIsMainThread(){
@@ -418,13 +418,8 @@ void bbStartup( int argc,char *argv[],void *dummy1,void *dummy2 ){
 	
 #if _WIN32
 
-	char *ebp;
 	OSVERSIONINFO os={ sizeof(os) };
 	
-	//asm( "movl %%ebp,%0;":"=r"(ebp) );//::"%ebp" );
-	
-	//bbGCStackTop=ebp+28;
-	
 	bbGCStartup();
 	bbThreadStartup();
 
@@ -435,7 +430,6 @@ void bbStartup( int argc,char *argv[],void *dummy1,void *dummy2 ){
 	}
 	
 	if( _bbusew ){
-		int e=0;
 		wchar_t buf[MAX_PATH];
 		
 		_wgetcwd( buf,MAX_PATH );
@@ -469,12 +463,12 @@ void bbStartup( int argc,char *argv[],void *dummy1,void *dummy2 ){
 
 		if( e ){
 			if( buf[e-1]==':' ) ++e;
-			bbAppDir=bbStringFromBytes( buf,e );
+			bbAppDir=bbStringFromBytes( (unsigned char*)buf,e );
 		}else{
 			bbAppDir=&bbEmptyString;
 		}
 
-		char *p=bbStringToCString( bbAppDir );
+		char *p=(char*)bbStringToCString( bbAppDir );
 		_chdir( p );
 		bbMemFree(p);
 	}

+ 26 - 24
blitz.mod/blitz_array.c

@@ -8,10 +8,14 @@ static void bbArrayFree( BBObject *o );
 static BBDebugScope debugScope={
 	BBDEBUGSCOPE_USERTYPE,
 	"Array",
-	BBDEBUGDECL_END
+	{
+		{
+			BBDEBUGDECL_END
+		}
+	}
 };
 
-BBClass bbArrayClass={
+BBClass_Array bbArrayClass={
 	&bbObjectClass, //extends
 	bbArrayFree,	//free
 	&debugScope,	//DebugScope
@@ -33,7 +37,7 @@ BBClass bbArrayClass={
 };
 
 BBArray bbEmptyArray={
-	&bbArrayClass,	//clas
+	(BBClass*)&bbArrayClass,	//clas
 	//BBGC_MANYREFS,	//refs
 	"",			//type
 	0,			//dims
@@ -46,7 +50,7 @@ BBArray bbEmptyArray={
 //***** Note: Only used by ref counting GC.
 static void bbArrayFree( BBObject *o ){
 	if (bbCountInstances) {
-		bbAtomicAdd(&bbArrayClass.instance_count, -1);
+		bbAtomicAdd((int*)&bbArrayClass.instance_count, -1);
 	}
 }
 
@@ -100,7 +104,7 @@ static BBArray *allocateArray( const char *type,int dims,int *lens, unsigned sho
 	int base_size = size;
 	size*=length;
 
-	arr=(BBArray*)bbGCAllocObject( BBARRAYSIZE(size,dims),&bbArrayClass,flags );
+	arr=(BBArray*)bbGCAllocObject( BBARRAYSIZE(size,dims),(BBClass*)&bbArrayClass,flags );
 
 	arr->type=type;
 	arr->dims=dims;
@@ -344,7 +348,6 @@ BBArray *bbArrayConcat( const char *type,BBArray *x,BBArray *y ){
 
 BBArray *bbArrayFromData( const char *type,int length,void *data ){
 
-	int k;
 	BBArray *arr;
 
 	if( length<=0 ) return &bbEmptyArray;
@@ -358,7 +361,6 @@ BBArray *bbArrayFromData( const char *type,int length,void *data ){
 
 BBArray *bbArrayFromDataStruct( const char *type,int length,void *data, unsigned short data_size ){
 
-	int k;
 	BBArray *arr;
 
 	if( length<=0 ) return &bbEmptyArray;
@@ -396,7 +398,7 @@ void * bbArrayIndex( BBArray * arr, int offset, int index) {
 BBArray *bbArrayCastFromObject( BBObject *o,const char *type ){
 	BBArray *arr=(BBArray*)o;
 	if( arr==&bbEmptyArray ) return arr;
-	if( arr->clas!=&bbArrayClass ) return &bbEmptyArray;
+	if( arr->clas!=(BBClass*)&bbArrayClass ) return &bbEmptyArray;
 	if( arr->type[0]==':' && type[0]==':' ) return arr;
 	if( strcmp( arr->type,type ) ) return &bbEmptyArray;
 	return arr;
@@ -444,36 +446,36 @@ QSORTARRAY( unsigned char,_qsort_b )
 QSORTARRAY( unsigned short,_qsort_s )
 QSORTARRAY( int,qsort_i )
 QSORTARRAY( unsigned int,qsort_u )
-QSORTARRAY( BBInt64,qsort_l );
-QSORTARRAY( BBUInt64,qsort_y );
-QSORTARRAY( float,qsort_f );
-QSORTARRAY( double,qsort_d );
-QSORTARRAY( BBSIZET,qsort_z );
+QSORTARRAY( BBInt64,qsort_l )
+QSORTARRAY( BBUInt64,qsort_y )
+QSORTARRAY( float,qsort_f )
+QSORTARRAY( double,qsort_d )
+QSORTARRAY( BBSIZET,qsort_z )
 #ifdef _WIN32
-QSORTARRAY( WPARAM,qsort_w );
-QSORTARRAY( LPARAM,qsort_x );
+QSORTARRAY( WPARAM,qsort_w )
+QSORTARRAY( LPARAM,qsort_x )
 #endif
 #undef LESSTHAN
 #define LESSTHAN(X,Y) ((*X)->clas->Compare(*(X),*(Y))<0)
-QSORTARRAY( BBObject*,qsort_obj );
+QSORTARRAY( BBObject*,qsort_obj )
 #undef LESSTHAN
 #define LESSTHAN(X,Y) (*(X)>*(Y))
 QSORTARRAY( unsigned char,qsort_b_d )
 QSORTARRAY( unsigned short,qsort_s_d )
 QSORTARRAY( int,qsort_i_d )
 QSORTARRAY( unsigned int,qsort_u_d )
-QSORTARRAY( BBInt64,qsort_l_d );
-QSORTARRAY( BBUInt64,qsort_y_d );
-QSORTARRAY( float,qsort_f_d );
-QSORTARRAY( double,qsort_d_d );
-QSORTARRAY( BBSIZET,qsort_z_d );
+QSORTARRAY( BBInt64,qsort_l_d )
+QSORTARRAY( BBUInt64,qsort_y_d )
+QSORTARRAY( float,qsort_f_d )
+QSORTARRAY( double,qsort_d_d )
+QSORTARRAY( BBSIZET,qsort_z_d )
 #ifdef _WIN32
-QSORTARRAY( WPARAM,qsort_w_d );
-QSORTARRAY( LPARAM,qsort_x_d );
+QSORTARRAY( WPARAM,qsort_w_d )
+QSORTARRAY( LPARAM,qsort_x_d )
 #endif
 #undef LESSTHAN
 #define LESSTHAN(X,Y) ((*X)->clas->Compare(*(X),*(Y))>0)
-QSORTARRAY( BBObject*,qsort_obj_d );
+QSORTARRAY( BBObject*,qsort_obj_d )
 
 void bbArraySort( BBArray *arr,int ascending ){
 	int n;