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

* ccl.c (Vccl_program_table): Now static.
(check_ccl_update): Remove; unused.

diff --git a/src/ChangeLog b/src/ChangeLog
index dd0166bd0f34f4b0af3c9b2d04db4c3b933f7f51..dcbab4b96b789fd82a32cc7742000395c3518eb5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 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.h: ... from here.
        * category.c (check_category_table, set_category_set): Now static.

diff --git a/src/ccl.c b/src/ccl.c
index e09cf4f86d992f9a85df2966a35150212fcaf45b..14194a70c26a0be0aa4f275ee9c061318a3fb27b 100644 (file)
--- 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 98a4008e59fe09313c7af714b5b2b9ce01968576..e86154352a31c58d07ce6522c7e2b03a2a8c3e86 100644 (file)
--- 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);