From 3018cf63730a74e6accad667640757a77f776c5d Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 2 Mar 2007 10:12:41 +0000 Subject: [PATCH] *** empty log message *** --- ase/awk/awk.c | 11 +---------- ase/awk/awk_i.h | 7 +------ ase/awk/func.c | 4 ++-- ase/awk/run.c | 50 ++----------------------------------------------- 4 files changed, 6 insertions(+), 66 deletions(-) diff --git a/ase/awk/awk.c b/ase/awk/awk.c index 0403b629..231b84bb 100644 --- a/ase/awk/awk.c +++ b/ase/awk/awk.c @@ -1,5 +1,5 @@ /* - * $Id: awk.c,v 1.111 2007-03-02 10:06:17 bacon Exp $ + * $Id: awk.c,v 1.112 2007-03-02 10:12:40 bacon Exp $ * * {License} */ @@ -151,11 +151,6 @@ ase_awk_t* ase_awk_open ( ase_awk_setmaxdepth (awk, ASE_AWK_DEPTH_REX_BUILD, 0); ase_awk_setmaxdepth (awk, ASE_AWK_DEPTH_REX_MATCH, 0); - /* - awk->run.count = 0; - awk->run.ptr = ASE_NULL; - */ - awk->custom_data = custom_data; return awk; } @@ -176,10 +171,6 @@ int ase_awk_close (ase_awk_t* awk) if (ase_awk_clear (awk) == -1) return -1; ase_awk_clrbfn (awk); - /* - ASE_AWK_ASSERT (awk, awk->run.count == 0 && awk->run.ptr == ASE_NULL); - */ - ase_awk_map_close (&awk->tree.afns); ase_awk_tab_close (&awk->parse.globals); ase_awk_tab_close (&awk->parse.locals); diff --git a/ase/awk/awk_i.h b/ase/awk/awk_i.h index 37b76ad0..248f73e3 100644 --- a/ase/awk/awk_i.h +++ b/ase/awk/awk_i.h @@ -1,5 +1,5 @@ /* - * $Id: awk_i.h,v 1.104 2007-03-02 10:06:17 bacon Exp $ + * $Id: awk_i.h,v 1.105 2007-03-02 10:12:40 bacon Exp $ * * {License} */ @@ -189,11 +189,6 @@ struct ase_awk_t struct { - /* - ase_size_t count; - ase_awk_run_t* ptr; - */ - struct { struct diff --git a/ase/awk/func.c b/ase/awk/func.c index 3d375e3f..5b0654c6 100644 --- a/ase/awk/func.c +++ b/ase/awk/func.c @@ -1,5 +1,5 @@ /* - * $Id: func.c,v 1.97 2007-02-24 14:31:44 bacon Exp $ + * $Id: func.c,v 1.98 2007-03-02 10:12:40 bacon Exp $ * * {License} */ @@ -56,7 +56,7 @@ void* ase_awk_addbfn ( awk->prmfns.misc.sprintf ( awk->prmfns.misc.custom_data, awk->errmsg, ASE_COUNTOF(awk->errmsg), - ASE_T("'%.*s' added already"), name_len, name); + ASE_T("'%.*s' added already"), (int)name_len, name); ase_awk_seterror (awk, ASE_AWK_EEXIST, 0, awk->errmsg); return ASE_NULL; } diff --git a/ase/awk/run.c b/ase/awk/run.c index b0f77711..5c4d8b15 100644 --- a/ase/awk/run.c +++ b/ase/awk/run.c @@ -1,5 +1,5 @@ /* - * $Id: run.c,v 1.332 2007-03-02 10:06:17 bacon Exp $ + * $Id: run.c,v 1.333 2007-03-02 10:12:41 bacon Exp $ * * {License} */ @@ -55,11 +55,6 @@ static int __set_global ( ase_awk_run_t* run, ase_size_t idx, ase_awk_nde_var_t* var, ase_awk_val_t* val); -/* -static void __add_run (ase_awk_t* awk, ase_awk_run_t* run); -static void __del_run (ase_awk_t* awk, ase_awk_run_t* run); -*/ - static int __init_run ( ase_awk_run_t* run, ase_awk_t* awk, ase_awk_runios_t* runios, void* custom_data, int* errnum); @@ -664,9 +659,6 @@ int ase_awk_run (ase_awk_t* awk, /* clear the run object space */ ase_memset (run, 0, ASE_SIZEOF(ase_awk_run_t)); - /* add the run object to the awk object */ - /*__add_run (awk, run);*/ - /* initialize the run object */ if (__init_run (run, awk, runios, custom_data, &errnum) == -1) { @@ -780,49 +772,11 @@ static void __free_namedval (void* run, void* val) ase_awk_refdownval ((ase_awk_run_t*)run, val); } -/* -static void __add_run (ase_awk_t* awk, ase_awk_run_t* run) -{ - ASE_AWK_LOCK (awk); - - run->awk = awk; - run->prev = ASE_NULL; - run->next = awk->run.ptr; - if (run->next != ASE_NULL) run->next->prev = run; - awk->run.ptr = run; - awk->run.count++; - - ASE_AWK_UNLOCK (awk); -} - -static void __del_run (ase_awk_t* awk, ase_awk_run_t* run) -{ - ASE_AWK_LOCK (awk); - - ASE_AWK_ASSERT (run->awk, awk->run.ptr != ASE_NULL); - - if (run->prev == ASE_NULL) - { - awk->run.ptr = run->next; - if (run->next != ASE_NULL) run->next->prev = ASE_NULL; - } - else - { - run->prev->next = run->next; - if (run->next != ASE_NULL) run->next->prev = run->prev; - } - - run->awk = ASE_NULL; - awk->run.count--; - - ASE_AWK_UNLOCK (awk); -} -*/ - static int __init_run ( ase_awk_run_t* run, ase_awk_t* awk, ase_awk_runios_t* runios, void* custom_data, int* errnum) { + run->awk = awk; run->custom_data = custom_data; run->stack = ASE_NULL;