Explorar el Código

fixed some gcc warnings

ncannasse hace 8 años
padre
commit
447e1f86b5
Se han modificado 3 ficheros con 7 adiciones y 7 borrados
  1. 1 1
      libs/fmt/fmt.c
  2. 4 6
      src/std/obj.c
  3. 2 0
      src/std/types.c

+ 1 - 1
libs/fmt/fmt.c

@@ -620,7 +620,7 @@ static void md5_finish( md5_context *ctx, uint8 digest[16] ) {
 
 HL_PRIM void HL_NAME(digest)( vbyte *out, vbyte *in, int length, int format ) {
 	if( format & 256 ) {
-		in = hl_to_utf8((uchar*)in);
+		in = (vbyte*)hl_to_utf8((uchar*)in);
 		length = (int)strlen((char*)in);
 	}
 	switch( format & 0xFF ) {

+ 4 - 6
src/std/obj.c

@@ -557,7 +557,6 @@ static void hl_dynobj_delete_field( vdynobj *o, hl_field_lookup *f ) {
 static hl_field_lookup *hl_dynobj_add_field( vdynobj *o, int hfield, hl_type *t ) {
 	int index;
 	int_val address_offset;
-	bool full_remap = false;
 
 	// expand data
 	if( hl_is_ptr(t) ) {
@@ -585,7 +584,6 @@ static hl_field_lookup *hl_dynobj_add_field( vdynobj *o, int hfield, hl_type *t
 		if( raw_size == o->raw_size )
 			memcpy(newData,o->raw_data,o->raw_size);
 		else {
-			full_remap = true;
 			raw_size = 0;
 			for(i=0;i<o->nfields;i++) {
 				hl_field_lookup *f = o->lookup + i;
@@ -785,7 +783,7 @@ static void *hl_obj_lookup_set( vdynamic *d, int hfield, hl_type *t, hl_type **f
 }
 
 HL_PRIM void hl_dyn_seti( vdynamic *d, int hfield, hl_type *t, int value ) {
-	hl_type *ft;
+	hl_type *ft = NULL;
 	void *addr = hl_obj_lookup_set(d,hfield,t,&ft);
 	switch( ft->kind ) {
 	case HUI8:
@@ -818,7 +816,7 @@ HL_PRIM void hl_dyn_seti( vdynamic *d, int hfield, hl_type *t, int value ) {
 }
 
 HL_PRIM void hl_dyn_setf( vdynamic *d, int hfield, float value ) {
-	hl_type *t;
+	hl_type *t = NULL;
 	void *addr = hl_obj_lookup_set(d,hfield,&hlt_f32,&t);
 	if( t->kind == HF32 )
 		*(float*)addr = value;
@@ -831,7 +829,7 @@ HL_PRIM void hl_dyn_setf( vdynamic *d, int hfield, float value ) {
 }
 
 HL_PRIM void hl_dyn_setd( vdynamic *d, int hfield, double value ) {
-	hl_type *t;
+	hl_type *t = NULL;
 	void *addr = hl_obj_lookup_set(d,hfield,&hlt_f64,&t);
 	if( t->kind == HF64 )
 		*(double*)addr = value;
@@ -844,7 +842,7 @@ HL_PRIM void hl_dyn_setd( vdynamic *d, int hfield, double value ) {
 }
 
 HL_PRIM void hl_dyn_setp( vdynamic *d, int hfield, hl_type *t, void *value ) {
-	hl_type *ft;
+	hl_type *ft = NULL;
 	void *addr = hl_obj_lookup_set(d,hfield,t,&ft);
 	if( hl_same_type(t,ft) || value == NULL )
 		*(void**)addr = value;

+ 2 - 0
src/std/types.c

@@ -105,6 +105,8 @@ HL_PRIM int hl_pad_struct( int size, hl_type *t ) {
 	case HBOOL:
 		GET_ALIGN(bool);
 		break;
+	default:
+		break;
 	}
 	return (-size) & (align - 1);
 }