Commit 127198fd authored by Paul Eggert's avatar Paul Eggert

* ccl.h (check_ccl_update, Vccl_program_table): Remove decls.

* ccl.c (Vccl_program_table): Now static.
(check_ccl_update): Remove; unused.
parent d85b608f
2011-04-11 Paul Eggert <eggert@cs.ucla.edu> 2011-04-11 Paul Eggert <eggert@cs.ucla.edu>
* 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.c (SET_CATEGORY_SET, set_category_set): Move here.
* category.h: ... from here. * category.h: ... from here.
* category.c (check_category_table, set_category_set): Now static. * category.c (check_category_table, set_category_set): Now static.
......
...@@ -56,7 +56,7 @@ static Lisp_Object Qccl_program_idx; ...@@ -56,7 +56,7 @@ static Lisp_Object Qccl_program_idx;
CCL_PROG is already resolved to index numbers or not, UPDATEDP (t 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 or nil) is the flat to tell if the CCL program is updated after it
was once used. */ was once used. */
Lisp_Object Vccl_program_table; static Lisp_Object Vccl_program_table;
/* Return a hash table of id number ID. */ /* Return a hash table of id number ID. */
#define GET_HASH_TABLE(id) \ #define GET_HASH_TABLE(id) \
...@@ -1929,30 +1929,6 @@ setup_ccl_program (struct ccl_program *ccl, Lisp_Object ccl_prog) ...@@ -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, 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. 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. */) See the documentation of `define-ccl-program' for the detail of CCL program. */)
......
...@@ -96,15 +96,9 @@ struct ccl_spec { ...@@ -96,15 +96,9 @@ struct ccl_spec {
execution of ccl program CCL_PROG (symbol or vector). */ execution of ccl program CCL_PROG (symbol or vector). */
extern int setup_ccl_program (struct ccl_program *, Lisp_Object); 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, extern void ccl_driver (struct ccl_program *, int *, int *, int, int,
Lisp_Object); Lisp_Object);
/* Vector of CCL program names vs corresponding program data. */
extern Lisp_Object Vccl_program_table;
extern Lisp_Object Qccl, Qcclp; extern Lisp_Object Qccl, Qcclp;
EXFUN (Fccl_program_p, 1); EXFUN (Fccl_program_p, 1);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment