From c642a2e7896a3b1fd88f0cf0e761cc12e8fcd27a Mon Sep 17 00:00:00 2001 From: jgarcia Date: Mon, 19 May 2008 07:44:09 +0000 Subject: [PATCH] Update sources to accomodate the new cl_dealloc() macro --- src/c/big.d | 2 +- src/c/ffi.d | 2 +- src/c/file.d | 4 ++-- src/c/gbc.d | 2 +- src/c/interpreter.d | 2 +- src/c/read.d | 4 ++-- src/c/unixfsys.d | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/c/big.d b/src/c/big.d index cc9dfd555..393448ccd 100644 --- a/src/c/big.d +++ b/src/c/big.d @@ -278,7 +278,7 @@ mp_free(void *ptr, size_t size) char *x = ptr; if (x < (char *)(cl_env.big_register_limbs) || x > (char *)(cl_env.big_register_limbs+2)) - cl_dealloc(x,size); + cl_dealloc(x); } void init_big_registers(void) diff --git a/src/c/ffi.d b/src/c/ffi.d index af1eb13d9..70d4ff005 100644 --- a/src/c/ffi.d +++ b/src/c/ffi.d @@ -130,7 +130,7 @@ si_free_foreign_data(cl_object f) FEwrong_type_argument(@'si::foreign-data', f); } if (f->foreign.size) { - cl_dealloc(f->foreign.data, f->foreign.size); + cl_dealloc(f->foreign.data); } f->foreign.size = 0; f->foreign.data = NULL; diff --git a/src/c/file.d b/src/c/file.d index 50cd97334..b27d47a29 100644 --- a/src/c/file.d +++ b/src/c/file.d @@ -550,7 +550,7 @@ static void flush_output_stream_binary(cl_object strm); if (fclose(fp) != 0) FElibc_error("Cannot close stream ~S.", 1, strm); #if !defined(GBC_BOEHM) - cl_dealloc(strm->stream.buffer, BUFSIZ); + cl_dealloc(strm->stream.buffer); strm->stream.file = NULL; #endif break; @@ -561,7 +561,7 @@ static void flush_output_stream_binary(cl_object strm); if ( closesocket( ( int )strm->stream.file ) != 0 ) wsock_error( "Cannot close Windows Socket ~S~%~A.", strm ); #if !defined(GBC_BOEHM) - cl_dealloc(strm->stream.buffer, BUFSIZ); + cl_dealloc(strm->stream.buffer); strm->stream.file = NULL; #endif break; diff --git a/src/c/gbc.d b/src/c/gbc.d index e08bb4b2f..1da296b79 100644 --- a/src/c/gbc.d +++ b/src/c/gbc.d @@ -721,7 +721,7 @@ contblock_sweep_phase(void) q = p + 4; while (q < e && !get_mark_bit((int *)q)) q += 4; - cl_dealloc(p, q - p); + cl_dealloc(p); p = q + 4; } i = j + 1; diff --git a/src/c/interpreter.d b/src/c/interpreter.d index 63cc490ee..2c8cf4668 100644 --- a/src/c/interpreter.d +++ b/src/c/interpreter.d @@ -46,7 +46,7 @@ cl_stack_set_size(cl_index new_size) #ifdef BOEHM_GBC GC_free(cl_env.stack); #else - cl_dealloc(cl_env.stack, cl_env.stack_size); + cl_dealloc(cl_env.stack); #endif cl_env.stack_size = new_size; cl_env.stack = new_stack; diff --git a/src/c/read.d b/src/c/read.d index e7033e144..3f62f4e50 100644 --- a/src/c/read.d +++ b/src/c/read.d @@ -514,7 +514,7 @@ ecl_parse_number(cl_object str, cl_index start, cl_index end, output = OBJNULL; } OUTPUT: - cl_dealloc(buffer, length+1); + cl_dealloc(buffer); return output; } } @@ -2140,7 +2140,7 @@ read_VV(cl_object block, void (*entry_point)(cl_object)) block->cblock.temp_data = NULL; block->cblock.temp_data_size = 0; memset(VVtemp, 0, bytes); - cl_dealloc(VVtemp, bytes); + cl_dealloc(VVtemp); } bds_unwind1(); } CL_UNWIND_PROTECT_EXIT { diff --git a/src/c/unixfsys.d b/src/c/unixfsys.d index 276ea9df5..9cc169f5c 100644 --- a/src/c/unixfsys.d +++ b/src/c/unixfsys.d @@ -276,7 +276,7 @@ ecl_backup_fopen(const char *filename, const char *option) if (rename(filename, backupfilename)) FElibc_error("Cannot rename the file ~S to ~S.", 2, make_constant_base_string(filename), make_simple_base_string(backupfilename)); - cl_dealloc(backupfilename, 0); + cl_dealloc(backupfilename); return fopen(filename, option); }