Skip to content

Commit 7e6d8ae

Browse files
committed
Merge pull request #11 from mattn/fix_compiler_warnings
Remove compiler warnings
2 parents b0a75ab + 6784d45 commit 7e6d8ae

File tree

6 files changed

+4
-10
lines changed

6 files changed

+4
-10
lines changed

include/cfunc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static inline struct cfunc_state *
5858
cfunc_state(mrb_state *mrb, struct RClass* obj)
5959
{
6060
if(obj == NULL) {
61-
obj = mrb_object(mrb_vm_const_get(mrb, mrb_intern(mrb, "CFunc")));
61+
obj = (struct RClass*) mrb_object(mrb_vm_const_get(mrb, mrb_intern(mrb, "CFunc")));
6262
}
6363
mrb_value state = mrb_mod_cv_get(mrb, obj, mrb_intern(mrb, "cfunc_state"));
6464
return (struct cfunc_state *)mrb_voidp(state);

src/cfunc_platform.c

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ cfunc_platform_is_macosx(mrb_state *mrb, mrb_value self)
4343

4444
void init_cfunc_platform(mrb_state *mrb, struct RClass* module)
4545
{
46-
struct cfunc_state *state = cfunc_state(mrb, module);
4746
struct RClass *struct_class = mrb_define_class_under(mrb, module, "Platform", mrb->object_class);
4847

4948
mrb_define_class_method(mrb, struct_class, "is_posix?", cfunc_platform_is_posix, ARGS_NONE());

src/cfunc_rubyvm.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ cfunc_rubyvm_class_thread(mrb_state *mrb, mrb_value klass)
359359
{
360360
// init bindle data with RubyVM object
361361
struct RClass *c = mrb_class_ptr(klass);
362-
struct cfunc_state *state = cfunc_state(mrb, c);
363362
struct cfunc_rubyvm_data *data = malloc(sizeof(struct cfunc_rubyvm_data));
364363
mrb_value self = mrb_obj_value((struct RObject *)Data_Wrap_Struct(mrb, c, &cfunc_rubyvm_data_type, data));
365364

@@ -394,7 +393,7 @@ init_cfunc_rubyvm(mrb_state *mrb, struct RClass* module)
394393

395394
struct RClass *rubyvm_class = mrb_define_class_under(mrb, module, "RubyVM", mrb->object_class);
396395
state->rubyvm_class = rubyvm_class;
397-
set_cfunc_state(mrb, (struct RObject*)rubyvm_class, state);
396+
set_cfunc_state(mrb, rubyvm_class, state);
398397

399398
mrb_define_class_method(mrb, rubyvm_class, "thread", cfunc_rubyvm_class_thread, ARGS_REQ(1));
400399
mrb_define_method(mrb, rubyvm_class, "dispatch", cfunc_rubyvm_dispatch, ARGS_ANY());

src/cfunc_struct.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ init_cfunc_struct(mrb_state *mrb, struct RClass* module)
8383
{
8484
struct cfunc_state *state = cfunc_state(mrb, module);
8585
struct RClass *struct_class = mrb_define_class_under(mrb, module, "Struct", mrb->object_class);
86-
set_cfunc_state(mrb, (struct RObject*)struct_class, state);
86+
set_cfunc_state(mrb, struct_class, state);
8787
state->struct_class = struct_class;
8888

8989
mrb_define_class_method(mrb, struct_class, "define_struct", cfunc_struct_define_struct, ARGS_REQ(1));

src/cfunc_type.c

+1-3
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,6 @@ cfunc_uint64_class_get(mrb_state *mrb, mrb_value klass)
301301
mrb_value pointer;
302302
mrb_get_args(mrb, "o", &pointer);
303303

304-
struct mrb_ffi_type *mft = rclass_to_mrb_ffi_type(mrb, mrb_class_ptr(klass));
305304
uint64_t uint64 = *(uint64_t*)cfunc_pointer_ptr(pointer);
306305

307306
if(uint64 > UINT32_MAX) {
@@ -387,7 +386,6 @@ cfunc_sint64_class_get(mrb_state *mrb, mrb_value klass)
387386
mrb_value pointer;
388387
mrb_get_args(mrb, "o", &pointer);
389388

390-
struct mrb_ffi_type *mft = rclass_to_mrb_ffi_type(mrb, mrb_class_ptr(klass));
391389
int64_t sint64 = *(int64_t*)cfunc_pointer_ptr(pointer);
392390

393391
if(sint64 > INT32_MAX || sint64 < INT32_MIN) {
@@ -577,7 +575,7 @@ void init_cfunc_type(mrb_state *mrb, struct RClass* module)
577575
struct RClass *type_class = mrb_define_class_under(mrb, module, "Type", mrb->object_class);
578576
MRB_SET_INSTANCE_TT(type_class, MRB_TT_DATA);
579577
state->type_class = type_class;
580-
set_cfunc_state(mrb, (struct RObject*)type_class, state);
578+
set_cfunc_state(mrb, type_class, state);
581579

582580
int ai = mrb_gc_arena_save(mrb);
583581
mrb_define_class_method(mrb, type_class, "refer", cfunc_type_class_refer, ARGS_REQ(1));

src/vector.c

-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ vector_p create_vector(){
7070
vector_p subvector(vector_p vec, int start, int end){
7171
vector_p subvec = create_vector();
7272
int i;
73-
void * val;
7473
for(i=start; i<end; i++){
7574
vector_add(subvec, vec->data[i]);
7675
}
@@ -133,7 +132,6 @@ void vector_remove(vector_p vec, size_t i){
133132

134133
int vector_index(vector_p vec, void* data){
135134
int x;
136-
void* check;
137135
for(x=0;x<vec->length;++x){
138136
if(vec->data[x] == data){
139137
return x;

0 commit comments

Comments
 (0)