From 127198fdc718d38078cf6abeb6f3a0862f3ac1d2 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 10 Apr 2011 23:43:21 -0700 Subject: [PATCH] * ccl.h (check_ccl_update, Vccl_program_table): Remove decls. * ccl.c (Vccl_program_table): Now static. (check_ccl_update): Remove; unused. --- src/ChangeLog | 4 ++++ src/ccl.c | 26 +------------------------- src/ccl.h | 6 ------ 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index dd0166bd0f3..dcbab4b96b7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-04-11 Paul Eggert + * ccl.h (check_ccl_update, Vccl_program_table): Remove decls. + * ccl.c (Vccl_program_table): Now static. + (check_ccl_update): Remove; unused. + * category.c (SET_CATEGORY_SET, set_category_set): Move here. * category.h: ... from here. * category.c (check_category_table, set_category_set): Now static. diff --git a/src/ccl.c b/src/ccl.c index e09cf4f86d9..14194a70c26 100644 --- a/src/ccl.c +++ b/src/ccl.c @@ -56,7 +56,7 @@ static Lisp_Object Qccl_program_idx; CCL_PROG is already resolved to index numbers or not, UPDATEDP (t or nil) is the flat to tell if the CCL program is updated after it was once used. */ -Lisp_Object Vccl_program_table; +static Lisp_Object Vccl_program_table; /* Return a hash table of id number ID. */ #define GET_HASH_TABLE(id) \ @@ -1929,30 +1929,6 @@ setup_ccl_program (struct ccl_program *ccl, Lisp_Object ccl_prog) } -/* Check if CCL is updated or not. If not, re-setup members of CCL. */ - -int -check_ccl_update (struct ccl_program *ccl) -{ - Lisp_Object slot, ccl_prog; - - if (ccl->idx < 0) - return 0; - slot = AREF (Vccl_program_table, ccl->idx); - if (NILP (AREF (slot, 3))) - return 0; - ccl_prog = ccl_get_compiled_code (AREF (slot, 0), &ccl->idx); - if (! VECTORP (ccl_prog)) - return -1; - ccl->size = ASIZE (ccl_prog); - ccl->prog = XVECTOR (ccl_prog)->contents; - ccl->eof_ic = XINT (AREF (ccl_prog, CCL_HEADER_EOF)); - ccl->buf_magnification = XINT (AREF (ccl_prog, CCL_HEADER_BUF_MAG)); - ASET (slot, 3, Qnil); - return 0; -} - - DEFUE ("ccl-program-p", Fccl_program_p, Sccl_program_p, 1, 1, 0, doc: /* Return t if OBJECT is a CCL program name or a compiled CCL program code. See the documentation of `define-ccl-program' for the detail of CCL program. */) diff --git a/src/ccl.h b/src/ccl.h index 98a4008e59f..e86154352a3 100644 --- a/src/ccl.h +++ b/src/ccl.h @@ -96,15 +96,9 @@ struct ccl_spec { execution of ccl program CCL_PROG (symbol or vector). */ extern int setup_ccl_program (struct ccl_program *, Lisp_Object); -/* Check if CCL is updated or not. If not, re-setup members of CCL. */ -extern int check_ccl_update (struct ccl_program *); - extern void ccl_driver (struct ccl_program *, int *, int *, int, int, Lisp_Object); -/* Vector of CCL program names vs corresponding program data. */ -extern Lisp_Object Vccl_program_table; - extern Lisp_Object Qccl, Qcclp; EXFUN (Fccl_program_p, 1); -- 2.39.2