[uim-commit] r1096 - trunk/uim
tkng at freedesktop.org
tkng at freedesktop.org
Tue Aug 2 13:18:38 EST 2005
Author: tkng
Date: 2005-08-01 20:18:33 -0700 (Mon, 01 Aug 2005)
New Revision: 1096
Modified:
trunk/uim/slib.c
trunk/uim/uim-scm.c
trunk/uim/uim-scm.h
Log:
* uim/slib.c:
-(init_subr, init_subr_0,init_subr_1, init_subr_2, init_subr_2n,
init_subr_3, init_subr_4, init_subr_5, init_lsubr, init_fsubr,
init_msubr): Added const.
* uim/uim-scm.c, uim/uim-sch.h:
-(uim_scm_init_subr_0, uim_scm_init_subr_1, uim_scm_init_subr_2,
uim_scm_init_subr_3, uim_scm_init_subr_4, uim_scm_init_subr_5):
Added const.
Modified: trunk/uim/slib.c
===================================================================
--- trunk/uim/slib.c 2005-08-01 20:49:21 UTC (rev 1095)
+++ trunk/uim/slib.c 2005-08-02 03:18:33 UTC (rev 1096)
@@ -188,17 +188,17 @@
static LISP funcptrcons (C_FUNC ptr);
static LISP assoc (LISP x, LISP alist);
-static void init_subr (char *name, long type, SUBR_FUNC fcn);
-static void init_subr_0 (char *name, LISP (*fcn) (void));
-static void init_subr_1 (char *name, LISP (*fcn) (LISP));
-static void init_subr_2 (char *name, LISP (*fcn) (LISP, LISP));
-static void init_subr_2n (char *name, LISP (*fcn) (LISP, LISP));
-static void init_subr_3 (char *name, LISP (*fcn) (LISP, LISP, LISP));
-static void init_subr_4 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP));
-static void init_subr_5 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP));
-static void init_lsubr (char *name, LISP (*fcn) (LISP));
-static void init_fsubr (char *name, LISP (*fcn) (LISP, LISP));
-static void init_msubr (char *name, LISP (*fcn) (LISP *, LISP *));
+static void init_subr (const char *name, long type, SUBR_FUNC fcn);
+static void init_subr_0 (const char *name, LISP (*fcn) (void));
+static void init_subr_1 (const char *name, LISP (*fcn) (LISP));
+static void init_subr_2 (const char *name, LISP (*fcn) (LISP, LISP));
+static void init_subr_2n (const char *name, LISP (*fcn) (LISP, LISP));
+static void init_subr_3 (const char *name, LISP (*fcn) (LISP, LISP, LISP));
+static void init_subr_4 (const char *name, LISP (*fcn) (LISP, LISP, LISP, LISP));
+static void init_subr_5 (const char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP));
+static void init_lsubr (const char *name, LISP (*fcn) (LISP));
+static void init_fsubr (const char *name, LISP (*fcn) (LISP, LISP));
+static void init_msubr (const char *name, LISP (*fcn) (LISP *, LISP *));
static LISP delq (LISP elem, LISP l);
static void set_eval_hooks (long type, LISP (*fcn) (LISP, LISP *, LISP *));
@@ -472,7 +472,7 @@
fprintf (siod_output, "%s\n", siod_err_msg);
fflush (siod_output);
}
- if (siod_verbose_level >= 5)
+ if (siod_verbose_level >= 1)
show_backtrace();
if (errjmp_ok == 1)
{
@@ -2595,67 +2595,67 @@
}
static void
-init_subr (char *name, long type, SUBR_FUNC fcn)
+init_subr (const char *name, long type, SUBR_FUNC fcn)
{
setvar (rintern (name), subrcons (type, name, fcn), NIL);
}
static void
-init_subr_0 (char *name, LISP (*fcn) (void))
+init_subr_0 (const char *name, LISP (*fcn) (void))
{
init_subr (name, tc_subr_0, (SUBR_FUNC) fcn);
}
static void
-init_subr_1 (char *name, LISP (*fcn) (LISP))
+init_subr_1 (const char *name, LISP (*fcn) (LISP))
{
init_subr (name, tc_subr_1, (SUBR_FUNC) fcn);
}
static void
-init_subr_2 (char *name, LISP (*fcn) (LISP, LISP))
+init_subr_2 (const char *name, LISP (*fcn) (LISP, LISP))
{
init_subr (name, tc_subr_2, (SUBR_FUNC) fcn);
}
static void
-init_subr_2n (char *name, LISP (*fcn) (LISP, LISP))
+init_subr_2n (const char *name, LISP (*fcn) (LISP, LISP))
{
init_subr (name, tc_subr_2n, (SUBR_FUNC) fcn);
}
static void
-init_subr_3 (char *name, LISP (*fcn) (LISP, LISP, LISP))
+init_subr_3 (const char *name, LISP (*fcn) (LISP, LISP, LISP))
{
init_subr (name, tc_subr_3, (SUBR_FUNC) fcn);
}
static void
-init_subr_4 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP))
+init_subr_4 (const char *name, LISP (*fcn) (LISP, LISP, LISP, LISP))
{
init_subr (name, tc_subr_4, (SUBR_FUNC) fcn);
}
static void
-init_subr_5 (char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP))
+init_subr_5 (const char *name, LISP (*fcn) (LISP, LISP, LISP, LISP, LISP))
{
init_subr (name, tc_subr_5, (SUBR_FUNC) fcn);
}
static void
-init_lsubr (char *name, LISP (*fcn) (LISP))
+init_lsubr (const char *name, LISP (*fcn) (LISP))
{
init_subr (name, tc_lsubr, (SUBR_FUNC) fcn);
}
static void
-init_fsubr (char *name, LISP (*fcn) (LISP, LISP))
+init_fsubr (const char *name, LISP (*fcn) (LISP, LISP))
{
init_subr (name, tc_fsubr, (SUBR_FUNC) fcn);
}
static void
-init_msubr (char *name, LISP (*fcn) (LISP *, LISP *))
+init_msubr (const char *name, LISP (*fcn) (LISP *, LISP *))
{
init_subr (name, tc_msubr, (SUBR_FUNC) fcn);
}
Modified: trunk/uim/uim-scm.c
===================================================================
--- trunk/uim/uim-scm.c 2005-08-01 20:49:21 UTC (rev 1095)
+++ trunk/uim/uim-scm.c 2005-08-02 03:18:33 UTC (rev 1096)
@@ -57,7 +57,7 @@
#include "uim-compat-scm.c"
#endif
-static void siod_init_subr(char *name, long type, SUBR_FUNC fcn);
+static void siod_init_subr(const char *name, long type, SUBR_FUNC fcn);
static uim_lisp true_sym;
static uim_lisp false_sym;
@@ -388,7 +388,7 @@
}
static void
-siod_init_subr(char *name, long type, SUBR_FUNC fcn)
+siod_init_subr(const char *name, long type, SUBR_FUNC fcn)
{
uim_lisp stack_start;
@@ -398,38 +398,38 @@
}
void
-uim_scm_init_subr_0(char *name, uim_lisp (*fcn)(void))
+uim_scm_init_subr_0(const char *name, uim_lisp (*fcn)(void))
{
siod_init_subr(name, tc_subr_0, (SUBR_FUNC)fcn);
}
void
-uim_scm_init_subr_1(char *name, uim_lisp (*fcn)(uim_lisp))
+uim_scm_init_subr_1(const char *name, uim_lisp (*fcn)(uim_lisp))
{
siod_init_subr(name, tc_subr_1, (SUBR_FUNC)fcn);
}
void
-uim_scm_init_subr_2(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp))
+uim_scm_init_subr_2(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp))
{
siod_init_subr(name, tc_subr_2, (SUBR_FUNC)fcn);
}
void
-uim_scm_init_subr_3(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp))
+uim_scm_init_subr_3(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp))
{
siod_init_subr(name, tc_subr_3, (SUBR_FUNC)fcn);
}
void
-uim_scm_init_subr_4(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_4(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
uim_lisp))
{
siod_init_subr(name, tc_subr_4, (SUBR_FUNC)fcn);
}
void
-uim_scm_init_subr_5(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_5(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
uim_lisp, uim_lisp))
{
siod_init_subr(name, tc_subr_5, (SUBR_FUNC)fcn);
Modified: trunk/uim/uim-scm.h
===================================================================
--- trunk/uim/uim-scm.h 2005-08-01 20:49:21 UTC (rev 1095)
+++ trunk/uim/uim-scm.h 2005-08-02 03:18:33 UTC (rev 1096)
@@ -145,18 +145,18 @@
uim_scm_make_func_ptr(uim_func_ptr func_ptr);
void
-uim_scm_init_subr_0(char *name, uim_lisp (*fcn)(void));
+uim_scm_init_subr_0(const char *name, uim_lisp (*fcn)(void));
+void
+uim_scm_init_subr_1(const char *name, uim_lisp (*fcn)(uim_lisp));
void
-uim_scm_init_subr_1(char *name, uim_lisp (*fcn)(uim_lisp));
+uim_scm_init_subr_2(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp));
void
-uim_scm_init_subr_2(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp));
+uim_scm_init_subr_3(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp));
void
-uim_scm_init_subr_3(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp));
-void
-uim_scm_init_subr_4(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_4(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
uim_lisp));
void
-uim_scm_init_subr_5(char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_5(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
uim_lisp, uim_lisp));
/* constants */
More information about the uim-commit
mailing list