| -rw-r--r-- | devices/cairo/cairo-main.c | 2 | ||||
| -rw-r--r-- | hieroglyph/hgallocator.c | 4 | ||||
| -rw-r--r-- | hieroglyph/hgscanner.l | 2 | ||||
| -rw-r--r-- | hieroglyph/hgvm.c | 16 | ||||
| -rw-r--r-- | plugins/unittest/unittest-main.c | 2 | ||||
| -rw-r--r-- | tests/hgarray.c | 2 | ||||
| -rw-r--r-- | tests/hgdict.c | 2 | ||||
| -rw-r--r-- | tests/hgstring.c | 2 |
8 files changed, 10 insertions, 22 deletions
diff --git a/devices/cairo/cairo-main.c b/devices/cairo/cairo-main.c index 287d190..5889518 100644 --- a/devices/cairo/cairo-main.c +++ b/devices/cairo/cairo-main.c @@ -577,7 +577,7 @@ _hg_cairo_device_fill(hg_device_t *device, finalize: hg_mem_unlock_object(gstate->o.mem, qpath); - return TRUE; + return retval; } static hg_bool_t diff --git a/hieroglyph/hgallocator.c b/hieroglyph/hgallocator.c index 18fddfb..5746a21 100644 --- a/hieroglyph/hgallocator.c +++ b/hieroglyph/hgallocator.c @@ -723,7 +723,7 @@ _hg_allocator_real_lock_object(hg_allocator_data_t *data, { hg_allocator_private_t *priv; hg_allocator_block_t *retval = NULL; - hg_int_t old_val; + hg_int_t old_val HG_GNUC_UNUSED; hg_int_t page; hg_uint_t idx; @@ -795,7 +795,7 @@ _hg_allocator_block_ref(hg_allocator_data_t *data, { hg_allocator_private_t *priv; hg_allocator_block_t *block; - hg_int_t old_val; + hg_int_t old_val HG_GNUC_UNUSED; priv = (hg_allocator_private_t *)data; block = _hg_allocator_get_internal_block(priv, qdata, FALSE); diff --git a/hieroglyph/hgscanner.l b/hieroglyph/hgscanner.l index 938eb3c..fc83ae8 100644 --- a/hieroglyph/hgscanner.l +++ b/hieroglyph/hgscanner.l @@ -554,7 +554,7 @@ hg_scanner_attach_file(hg_scanner_t *scanner, hg_file_t *file) { YY_BUFFER_STATE yystate; - struct yyguts_t *yyg; + struct yyguts_t *yyg HG_GNUC_UNUSED; hg_return_val_if_fail (scanner != NULL, FALSE, HG_e_VMerror); hg_return_val_if_fail (file != NULL, FALSE, HG_e_VMerror); diff --git a/hieroglyph/hgvm.c b/hieroglyph/hgvm.c index 4dc644b..cb84337 100644 --- a/hieroglyph/hgvm.c +++ b/hieroglyph/hgvm.c @@ -75,11 +75,6 @@ typedef struct _hg_vm_stack_dump_data_t { hg_stack_t *stack; hg_file_t *ofile; } hg_vm_stack_dump_data_t; -typedef struct _hg_vm_rs_dump_data_t { - hg_vm_t *vm; - hg_mem_t *mem; - hg_file_t *ofile; -} hg_vm_rs_dump_data_t; hg_mem_t *__hg_vm_mem = NULL; @@ -653,10 +648,9 @@ _hg_vm_quark_iterate_to_cstr(hg_quark_t qdata, { hg_vm_t *vm = (hg_vm_t *)user_data; hg_string_t *s = NULL; - hg_quark_t q; hg_char_t *cstr = NULL; - q = hg_vm_quark_to_string(vm, qdata, TRUE, (hg_pointer_t *)&s); + hg_vm_quark_to_string(vm, qdata, TRUE, (hg_pointer_t *)&s); if (s) { cstr = hg_string_get_cstr(s); } @@ -2438,8 +2432,6 @@ hg_vm_reserved_spool_dump(hg_vm_t *vm, hg_mem_t *mem, hg_file_t *ofile) { - hg_vm_rs_dump_data_t data; - hg_return_if_fail (vm != NULL, HG_e_VMerror); hg_return_if_fail (mem != NULL, HG_e_VMerror); hg_return_if_fail (ofile != NULL, HG_e_VMerror); @@ -2447,10 +2439,6 @@ hg_vm_reserved_spool_dump(hg_vm_t *vm, /* to avoid unusable result when OOM */ hg_mem_spool_set_resizable(_hg_vm_get_mem(vm), TRUE); - data.vm = vm; - data.mem = mem; - data.ofile = ofile; - hg_file_append_printf(ofile, "Referenced blocks in %s\n", mem == vm->mem[HG_VM_MEM_GLOBAL] ? "global" : mem == vm->mem[HG_VM_MEM_LOCAL] ? "local" : @@ -2810,7 +2798,7 @@ hg_vm_dstack_remove(hg_vm_t *vm, dstack = vm->stacks[HG_VM_STACK_DSTACK]; ldata.vm = vm; ldata.result = FALSE; - ldata.qname = qname; + ldata.qname = quark; ldata.remove_all = remove_all; hg_stack_foreach(dstack, _hg_vm_real_dict_remove, &ldata, FALSE); diff --git a/plugins/unittest/unittest-main.c b/plugins/unittest/unittest-main.c index a1ef7b4..0ed70ce 100644 --- a/plugins/unittest/unittest-main.c +++ b/plugins/unittest/unittest-main.c @@ -45,7 +45,7 @@ DEFUNC_OPER (private_validatetestresult) hg_string_t *sexp; hg_dict_t *d; hg_bool_t verbose = FALSE, result = TRUE; - hg_int_t attrs = 0; + hg_int_t attrs HG_GNUC_UNUSED = 0; /* XXX */ hg_char_t *cexp; hg_error_reason_t e = 0; diff --git a/tests/hgarray.c b/tests/hgarray.c index 16fc82f..e54bc1c 100644 --- a/tests/hgarray.c +++ b/tests/hgarray.c @@ -69,7 +69,7 @@ TDEF (get_capsulated_size) TDEF (gc_mark) { - hg_quark_t q; + hg_quark_t q HG_GNUC_UNUSED; hg_array_t *a; hg_size_t size = 0; hg_mem_t *m = hg_mem_spool_new(HG_MEM_TYPE_LOCAL, 256); diff --git a/tests/hgdict.c b/tests/hgdict.c index ea91901..cfbec65 100644 --- a/tests/hgdict.c +++ b/tests/hgdict.c @@ -135,7 +135,7 @@ _gc_func(hg_mem_t *mem, TDEF (gc_mark) { - hg_quark_t q; + hg_quark_t q HG_GNUC_UNUSED; hg_dict_t *d; hg_size_t size = 0; hg_mem_t *m = hg_mem_spool_new(HG_MEM_TYPE_LOCAL, 65535); diff --git a/tests/hgstring.c b/tests/hgstring.c index e139fea..21017cd 100644 --- a/tests/hgstring.c +++ b/tests/hgstring.c @@ -79,7 +79,7 @@ _gc_func(hg_mem_t *mem, TDEF (gc_mark) { - hg_quark_t q; + hg_quark_t q HG_GNUC_UNUSED; hg_string_t *s; hg_size_t size = 0; hg_mem_t *m = hg_mem_spool_new(HG_MEM_TYPE_LOCAL, 256); |