Переглянути джерело

Added casts. Removed code. (#341)

Brucey 8 місяців тому
батько
коміт
044ebaffbc

+ 1 - 1
blitz.mod/blitz_gc.c

@@ -134,7 +134,7 @@ int bbGCValidate( void *q ){
 			}
 		}
 		// maybe an array?
-		if (clas == &bbArrayClass) {
+		if (clas == (BBClass *)&bbArrayClass) {
 			return 1;
 		}
 	}

+ 5 - 5
blitz.mod/blitz_object.c

@@ -99,7 +99,7 @@ void bbObjectReserved(){
 }
 
 BBObject *bbObjectStringcast( BBObject *o ){
-	if (o->clas == &bbStringClass) {
+	if (o->clas == (BBClass *)&bbStringClass) {
 		return o;
 	} else {
 		return (BBObject *)&bbEmptyString;
@@ -107,11 +107,11 @@ BBObject *bbObjectStringcast( BBObject *o ){
 }
 
 int bbObjectIsString( BBObject *o ){
-	return o->clas == &bbStringClass;
+	return o->clas == (BBClass *)&bbStringClass;
 }
 
 BBObject *bbObjectArraycast( BBObject *o ){
-	if (o->clas == &bbArrayClass) {
+	if (o->clas == (BBClass *)&bbArrayClass) {
 		return o;
 	} else {
 		return (BBObject *)&bbEmptyArray;
@@ -119,13 +119,13 @@ BBObject *bbObjectArraycast( BBObject *o ){
 }
 
 int bbObjectIsArray( BBObject *o ){
-	return o->clas == &bbArrayClass;
+	return o->clas == (BBClass *)&bbArrayClass;
 }
 
 BBObject *bbObjectDowncast( BBObject *o,BBClass *t ){
 	BBClass *p=o->clas;
 	while( p && p!=t ) p=p->super;
-	return p ? o : (t==&bbStringClass) ? (BBObject *)&bbEmptyString : (t==&bbArrayClass) ? (BBObject *)&bbEmptyArray : &bbNullObject;
+	return p ? o : (t==(BBClass *)&bbStringClass) ? (BBObject *)&bbEmptyString : (t==(BBClass *)&bbArrayClass) ? (BBObject *)&bbEmptyArray : &bbNullObject;
 }
 
 void bbObjectRegisterType( BBClass *clas ){

+ 1 - 1
blitz.mod/blitz_string.c

@@ -363,7 +363,7 @@ BBString *bbStringToString( BBString *t ){
 
 int bbStringCompare( BBString *x,BBString *y ){
 	int k,n,sz;
-	if (x->clas != &bbStringClass || y->clas != &bbStringClass) return -1; // only compare strings with strings
+	if (x->clas != (BBClass*)&bbStringClass || y->clas != (BBClass*)&bbStringClass) return -1; // only compare strings with strings
 
 	sz=x->length<y->length ? x->length : y->length;
 	if (x->length == y->length && x->hash) {

+ 1 - 1
blitz.mod/blitz_string.h

@@ -188,7 +188,7 @@ inline BBULONG bbStringHash( BBString * x ) {
 }
 
 inline int bbStringEquals( BBString *x,BBString *y ){
-	if (x->clas != &bbStringClass || y->clas != &bbStringClass) return 0; // only strings with strings
+	if (x->clas != (BBClass *)&bbStringClass || y->clas != (BBClass *)&bbStringClass) return 0; // only strings with strings
 
 	if (x->length-y->length != 0) return 0;
 	if (x->hash != 0 ) {

+ 0 - 2
io.mod/glue.c

@@ -213,10 +213,8 @@ int bmx_PHYSFS_setRoot(BBString * archive, BBString * subdir) {
 	char sbuf[1024];
 	size_t slen = 1024;
 
-	char * sd = 0;
 	if (subdir != &bbEmptyString) {
 		bbStringToUTF8StringBuffer(subdir, sbuf, &slen);
-		sd = &sbuf;
 	}
 
 	return PHYSFS_setRoot(abuf, sbuf);