From 8226e674d7ecd002aec4a50d03509faebc42d3c5 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 13 Dec 2006 14:17:01 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/jni.c | 2 +- ase/awk/misc.c | 2 +- ase/awk/rec.c | 2 +- ase/awk/rex.c | 2 +- ase/awk/run.c | 2 +- ase/awk/str.c | 2 +- ase/awk/tab.c | 2 +- ase/awk/tree.c | 2 +- ase/awk/val.c | 2 +- ase/test/awk/awk.c | 82 +++++++++++++++++++++++----------------------- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/ase/awk/jni.c b/ase/awk/jni.c index fe2e539b..563d12de 100644 --- a/ase/awk/jni.c +++ b/ase/awk/jni.c @@ -1,5 +1,5 @@ /* - * $Id: jni.c,v 1.39 2006-12-13 14:13:07 bacon Exp $ + * $Id: jni.c,v 1.40 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/misc.c b/ase/awk/misc.c index d68b1997..a57561de 100644 --- a/ase/awk/misc.c +++ b/ase/awk/misc.c @@ -1,5 +1,5 @@ /* - * $Id: misc.c,v 1.45 2006-12-13 14:13:07 bacon Exp $ + * $Id: misc.c,v 1.46 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/rec.c b/ase/awk/rec.c index a4c6be30..a2fe204c 100644 --- a/ase/awk/rec.c +++ b/ase/awk/rec.c @@ -1,5 +1,5 @@ /* - * $Id: rec.c,v 1.10 2006-12-13 14:13:07 bacon Exp $ + * $Id: rec.c,v 1.11 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/rex.c b/ase/awk/rex.c index 6be0a035..72d6ec66 100644 --- a/ase/awk/rex.c +++ b/ase/awk/rex.c @@ -1,5 +1,5 @@ /* - * $Id: rex.c,v 1.51 2006-12-13 14:13:07 bacon Exp $ + * $Id: rex.c,v 1.52 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/run.c b/ase/awk/run.c index 8a8cfe36..a40acf5d 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.299 2006-12-13 14:13:07 bacon Exp $ + * $Id: run.c,v 1.300 2006-12-13 14:15:24 bacon Exp $ */ #include diff --git a/ase/awk/str.c b/ase/awk/str.c index 44d01419..3ad3d031 100644 --- a/ase/awk/str.c +++ b/ase/awk/str.c @@ -1,5 +1,5 @@ /* - * $Id: str.c,v 1.13 2006-12-13 14:13:07 bacon Exp $ + * $Id: str.c,v 1.14 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/tab.c b/ase/awk/tab.c index 7ba14a95..0a68f1aa 100644 --- a/ase/awk/tab.c +++ b/ase/awk/tab.c @@ -1,5 +1,5 @@ /* - * $Id: tab.c,v 1.26 2006-12-13 14:13:07 bacon Exp $ + * $Id: tab.c,v 1.27 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/tree.c b/ase/awk/tree.c index 7d6a24fa..66ea2617 100644 --- a/ase/awk/tree.c +++ b/ase/awk/tree.c @@ -1,5 +1,5 @@ /* - * $Id: tree.c,v 1.97 2006-12-13 14:13:07 bacon Exp $ + * $Id: tree.c,v 1.98 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/awk/val.c b/ase/awk/val.c index cbac0642..a064bdd4 100644 --- a/ase/awk/val.c +++ b/ase/awk/val.c @@ -1,5 +1,5 @@ /* - * $Id: val.c,v 1.97 2006-12-13 14:13:07 bacon Exp $ + * $Id: val.c,v 1.98 2006-12-13 14:16:12 bacon Exp $ */ #include diff --git a/ase/test/awk/awk.c b/ase/test/awk/awk.c index 33c5d3f0..7b1d10a6 100644 --- a/ase/test/awk/awk.c +++ b/ase/test/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.135 2006-12-04 12:59:00 bacon Exp $ + * $Id: awk.c,v 1.136 2006-12-13 14:17:01 bacon Exp $ */ #include @@ -645,8 +645,8 @@ static void __on_run_end (ase_awk_t* awk, void* handle, int errnum, void* arg) } #ifdef _WIN32 -typedef struct syscas_data_t syscas_data_t; -struct syscas_data_t +typedef struct sysfns_data_t sysfns_data_t; +struct sysfns_data_t { HANDLE heap; }; @@ -655,7 +655,7 @@ struct syscas_data_t static void* __awk_malloc (ase_size_t n, void* custom_data) { #ifdef _WIN32 - return HeapAlloc (((syscas_data_t*)custom_data)->heap, 0, n); + return HeapAlloc (((sysfns_data_t*)custom_data)->heap, 0, n); #else return malloc (n); #endif @@ -666,9 +666,9 @@ static void* __awk_realloc (void* ptr, ase_size_t n, void* custom_data) #ifdef _WIN32 /* HeapReAlloc behaves differently from realloc */ if (ptr == NULL) - return HeapAlloc (((syscas_data_t*)custom_data)->heap, 0, n); + return HeapAlloc (((sysfns_data_t*)custom_data)->heap, 0, n); else - return HeapReAlloc (((syscas_data_t*)custom_data)->heap, 0, ptr, n); + return HeapReAlloc (((sysfns_data_t*)custom_data)->heap, 0, ptr, n); #else return realloc (ptr, n); #endif @@ -677,7 +677,7 @@ static void* __awk_realloc (void* ptr, ase_size_t n, void* custom_data) static void __awk_free (void* ptr, void* custom_data) { #ifdef _WIN32 - HeapFree (((syscas_data_t*)custom_data)->heap, 0, ptr); + HeapFree (((sysfns_data_t*)custom_data)->heap, 0, ptr); #else free (ptr); #endif @@ -737,11 +737,11 @@ static int __main (int argc, ase_char_t* argv[]) ase_awk_runcbs_t runcbs; ase_awk_runios_t runios; ase_awk_runarg_t runarg[10]; - ase_awk_syscas_t syscas; + ase_awk_sysfns_t sysfns; struct src_io src_io = { NULL, NULL }; int opt, i, file_count = 0; #ifdef _WIN32 - syscas_data_t syscas_data; + sysfns_data_t sysfns_data; #endif const ase_char_t* mfn = ASE_NULL; @@ -788,51 +788,51 @@ static int __main (int argc, ase_char_t* argv[]) } } - memset (&syscas, 0, ASE_SIZEOF(syscas)); - syscas.malloc = __awk_malloc; - syscas.realloc = __awk_realloc; - syscas.free = __awk_free; + memset (&sysfns, 0, ASE_SIZEOF(sysfns)); + sysfns.malloc = __awk_malloc; + sysfns.realloc = __awk_realloc; + sysfns.free = __awk_free; - syscas.lock = NULL; - syscas.unlock = NULL; + sysfns.lock = NULL; + sysfns.unlock = NULL; - syscas.is_upper = __awk_isupper; - syscas.is_lower = __awk_islower; - syscas.is_alpha = __awk_isalpha; - syscas.is_digit = __awk_isdigit; - syscas.is_xdigit = __awk_isxdigit; - syscas.is_alnum = __awk_isalnum; - syscas.is_space = __awk_isspace; - syscas.is_print = __awk_isprint; - syscas.is_graph = __awk_isgraph; - syscas.is_cntrl = __awk_iscntrl; - syscas.is_punct = __awk_ispunct; - syscas.to_upper = __awk_toupper; - syscas.to_lower = __awk_tolower; + sysfns.is_upper = __awk_isupper; + sysfns.is_lower = __awk_islower; + sysfns.is_alpha = __awk_isalpha; + sysfns.is_digit = __awk_isdigit; + sysfns.is_xdigit = __awk_isxdigit; + sysfns.is_alnum = __awk_isalnum; + sysfns.is_space = __awk_isspace; + sysfns.is_print = __awk_isprint; + sysfns.is_graph = __awk_isgraph; + sysfns.is_cntrl = __awk_iscntrl; + sysfns.is_punct = __awk_ispunct; + sysfns.to_upper = __awk_toupper; + sysfns.to_lower = __awk_tolower; - syscas.memcpy = memcpy; - syscas.memset = memset; - syscas.pow = __awk_pow; - syscas.sprintf = __awk_sprintf; - syscas.aprintf = __awk_aprintf; - syscas.dprintf = __awk_dprintf; - syscas.abort = abort; + sysfns.memcpy = memcpy; + sysfns.memset = memset; + sysfns.pow = __awk_pow; + sysfns.sprintf = __awk_sprintf; + sysfns.aprintf = __awk_aprintf; + sysfns.dprintf = __awk_dprintf; + sysfns.abort = abort; #ifdef _WIN32 - syscas_data.heap = HeapCreate (0, 1000000, 1000000); - if (syscas_data.heap == NULL) + sysfns_data.heap = HeapCreate (0, 1000000, 1000000); + if (sysfns_data.heap == NULL) { xp_printf (ASE_T("Error: cannot create an awk heap\n")); return -1; } - syscas.custom_data = &syscas_data; + sysfns.custom_data = &sysfns_data; #endif - if ((awk = ase_awk_open(&syscas)) == ASE_NULL) + if ((awk = ase_awk_open(&sysfns)) == ASE_NULL) { #ifdef _WIN32 - HeapDestroy (syscas_data.heap); + HeapDestroy (sysfns_data.heap); #endif xp_printf (ASE_T("Error: cannot open awk\n")); return -1; @@ -897,7 +897,7 @@ static int __main (int argc, ase_char_t* argv[]) ase_awk_close (awk); #ifdef _WIN32 - HeapDestroy (syscas_data.heap); + HeapDestroy (sysfns_data.heap); #endif return 0; }