Author: yamakenz
Date: Mon Aug 27 20:31:36 2007
New Revision: 4913
Modified:
trunk/uim/intl.c
trunk/uim/plugin.c
trunk/uim/uim-func.c
trunk/uim/uim-key.c
trunk/uim/uim-util.c
trunk/uim/uim.c
Log:
* uim/uim.c
* uim/uim-key.c
* uim/uim-func.c
* uim/uim-util.c
* uim/plugin.c
* uim/intl.c
- Replace all canonical uim-scm forms with abbreviated ones by
tools/abbrev-uim-scm.pl. No other changes are applied
Modified: trunk/uim/intl.c
==============================================================================
--- trunk/uim/intl.c (original)
+++ trunk/uim/intl.c Mon Aug 27 20:31:36 2007
@@ -54,7 +54,7 @@
static uim_lisp
intl_gettext_package()
{
- return uim_scm_make_str(GETTEXT_PACKAGE);
+ return MAKE_STR(GETTEXT_PACKAGE);
}
@@ -66,10 +66,10 @@
if (FALSEP(domainname)) {
new_domain = textdomain(NULL);
} else {
- new_domain = textdomain(uim_scm_refer_c_str(domainname));
+ new_domain = textdomain(REFER_C_STR(domainname));
}
- return uim_scm_make_str(new_domain);
+ return MAKE_STR(new_domain);
}
static uim_lisp
@@ -77,15 +77,15 @@
{
const char *domain, *new_dir;
- domain = uim_scm_refer_c_str(domainname);
+ domain = REFER_C_STR(domainname);
if (FALSEP(dirname)) {
new_dir = bindtextdomain(domain, NULL);
} else {
- new_dir = bindtextdomain(domain, uim_scm_refer_c_str(dirname));
+ new_dir = bindtextdomain(domain, REFER_C_STR(dirname));
}
- return uim_scm_make_str(new_dir);
+ return MAKE_STR(new_dir);
}
static uim_lisp
@@ -94,15 +94,15 @@
const char *c_current_codeset, *c_codeset;
uim_lisp current_codeset;
- if (!uim_scm_stringp(domainname)
- || !(uim_scm_stringp(codeset) || FALSEP(codeset)))
+ if (!STRP(domainname)
+ || !(STRP(codeset) || FALSEP(codeset)))
return uim_scm_f();
- c_codeset = (FALSEP(codeset)) ? NULL : uim_scm_refer_c_str(codeset);
- c_current_codeset = bind_textdomain_codeset(uim_scm_refer_c_str(domainname),
+ c_codeset = (FALSEP(codeset)) ? NULL : REFER_C_STR(codeset);
+ c_current_codeset = bind_textdomain_codeset(REFER_C_STR(domainname),
c_codeset);
if (c_current_codeset) {
- current_codeset = uim_scm_make_str(c_current_codeset);
+ current_codeset = MAKE_STR(c_current_codeset);
} else {
current_codeset = uim_scm_f();
}
@@ -113,7 +113,7 @@
static uim_lisp
intl_gettext(uim_lisp msgid)
{
- return uim_scm_make_str(gettext(uim_scm_refer_c_str(msgid)));
+ return MAKE_STR(gettext(REFER_C_STR(msgid)));
}
static uim_lisp
@@ -121,48 +121,48 @@
{
const char *translated;
- if (!uim_scm_stringp(domainname) || !uim_scm_stringp(msgid))
+ if (!STRP(domainname) || !STRP(msgid))
return uim_scm_f();
- translated = dgettext(uim_scm_refer_c_str(domainname),
- uim_scm_refer_c_str(msgid));
+ translated = dgettext(REFER_C_STR(domainname),
+ REFER_C_STR(msgid));
- return uim_scm_make_str(translated);
+ return MAKE_STR(translated);
}
static uim_lisp
intl_dcgettext(uim_lisp domainname, uim_lisp msgid, uim_lisp category)
{
- return uim_scm_make_str(dcgettext(uim_scm_refer_c_str(domainname),
- uim_scm_refer_c_str(msgid),
- uim_scm_c_int(category)));
+ return MAKE_STR(dcgettext(REFER_C_STR(domainname),
+ REFER_C_STR(msgid),
+ C_INT(category)));
}
static uim_lisp
intl_ngettext(uim_lisp msgid1, uim_lisp msgid2, uim_lisp n)
{
- return uim_scm_make_str(ngettext(uim_scm_refer_c_str(msgid1),
- uim_scm_refer_c_str(msgid2),
- uim_scm_c_int(n)));
+ return MAKE_STR(ngettext(REFER_C_STR(msgid1),
+ REFER_C_STR(msgid2),
+ C_INT(n)));
}
static uim_lisp
intl_dngettext(uim_lisp domainname, uim_lisp msgid1, uim_lisp msgid2, uim_lisp
n)
{
- return uim_scm_make_str(dngettext(uim_scm_refer_c_str(domainname),
- uim_scm_refer_c_str(msgid1),
- uim_scm_refer_c_str(msgid2),
- uim_scm_c_int(n)));
+ return MAKE_STR(dngettext(REFER_C_STR(domainname),
+ REFER_C_STR(msgid1),
+ REFER_C_STR(msgid2),
+ C_INT(n)));
}
static uim_lisp
intl_dcngettext(uim_lisp domainname, uim_lisp msgid1, uim_lisp msgid2,
uim_lisp n, uim_lisp category)
{
- return uim_scm_make_str(dcngettext(uim_scm_refer_c_str(domainname),
- uim_scm_refer_c_str(msgid1),
- uim_scm_refer_c_str(msgid2),
- uim_scm_c_int(n),
- uim_scm_c_int(category)));
+ return MAKE_STR(dcngettext(REFER_C_STR(domainname),
+ REFER_C_STR(msgid1),
+ REFER_C_STR(msgid2),
+ C_INT(n),
+ C_INT(category)));
}
static void
Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c (original)
+++ trunk/uim/plugin.c Mon Aug 27 20:31:36 2007
@@ -83,7 +83,7 @@
uim_lisp vlevel;
vlevel = uim_scm_callf("verbose", "");
- return uim_scm_c_int(vlevel);
+ return C_INT(vlevel);
}
static uim_lisp
@@ -100,7 +100,7 @@
size_t len;
- plugin_name = uim_scm_refer_c_str(_name);
+ plugin_name = REFER_C_STR(_name);
if (plugin_name == NULL) {
return uim_scm_f();
@@ -109,13 +109,13 @@
DPRINTFN(UIM_VLEVEL_PLUGIN, (stderr, "Searching libuim-%s.so.\n",
plugin_name));
for (path_cdr = lib_path;
- !uim_scm_nullp(path_cdr);
- path_cdr = uim_scm_cdr(path_cdr))
+ !NULLP(path_cdr);
+ path_cdr = CDR(path_cdr))
{
int fd;
const char *path;
- path_car = uim_scm_car(path_cdr);
- path = uim_scm_refer_c_str(path_car);
+ path_car = CAR(path_cdr);
+ path = REFER_C_STR(path_car);
len = strlen(path) + 1 + strlen(PLUGIN_PREFIX) + strlen(plugin_name)+
strlen(PLUGIN_SUFFIX) + 1;
plugin_lib_filename = uim_malloc(sizeof(char) * len);
snprintf(plugin_lib_filename, len, "%s/%s%s%s",
@@ -132,13 +132,13 @@
DPRINTFN(UIM_VLEVEL_PLUGIN, (stderr, "Searching %s.scm.\n", plugin_name));
for (path_cdr = scm_path;
- !uim_scm_nullp(path_cdr);
- path_cdr = uim_scm_cdr(path_cdr))
+ !NULLP(path_cdr);
+ path_cdr = CDR(path_cdr))
{
int fd;
const char *path;
- path_car = uim_scm_car(path_cdr);
- path = uim_scm_refer_c_str(path_car);
+ path_car = CAR(path_cdr);
+ path = REFER_C_STR(path_car);
len = strlen(path) + 1 + strlen(plugin_name)+ strlen(".scm") + 1;
plugin_scm_filename = uim_malloc(sizeof(char) * len);
snprintf(plugin_scm_filename, len, "%s/%s.scm", path, plugin_name);
@@ -193,11 +193,11 @@
{
uim_lisp form;
- form = uim_scm_list5(uim_scm_make_symbol("plugin-list-append"),
+ form = LIST5(MAKE_SYM("plugin-list-append"),
_name,
- uim_scm_make_ptr(library),
- uim_scm_make_func_ptr(plugin_instance_init),
- uim_scm_make_func_ptr(plugin_instance_quit));
+ MAKE_PTR(library),
+ MAKE_FPTR(plugin_instance_init),
+ MAKE_FPTR(plugin_instance_quit));
uim_scm_eval(form);
}
free(plugin_scm_filename);
@@ -225,12 +225,12 @@
ret = uim_scm_callf("plugin-list-query-library", "o", _name);
if (FALSEP(ret))
return uim_scm_f();
- library = uim_scm_c_ptr(ret);
+ library = C_PTR(ret);
ret = uim_scm_callf("plugin-list-query-instance-quit", "o", _name);
if (FALSEP(ret))
return uim_scm_f();
- plugin_instance_quit = uim_scm_c_func_ptr(ret);
+ plugin_instance_quit = C_FPTR(ret);
(plugin_instance_quit)();
dlclose(library);
@@ -271,9 +271,9 @@
uim_lisp alist, rest, entry, name;
alist = uim_scm_eval_c_string("plugin-alist");
- for (rest = alist; !uim_scm_nullp(rest); rest = uim_scm_cdr(rest)) {
- entry = uim_scm_car(rest);
- name = uim_scm_car(entry);
+ for (rest = alist; !NULLP(rest); rest = CDR(rest)) {
+ entry = CAR(rest);
+ name = CAR(entry);
plugin_unload(name);
}
Modified: trunk/uim/uim-func.c
==============================================================================
--- trunk/uim/uim-func.c (original)
+++ trunk/uim/uim-func.c Mon Aug 27 20:31:36 2007
@@ -56,7 +56,7 @@
if (CONSP(c)) /* passed as Scheme-side input context */
c = CAR(c);
- uc = uim_scm_c_ptr(c);
+ uc = C_PTR(c);
assert(uc);
return uc;
@@ -68,7 +68,7 @@
{
uim_context uc;
- uc = uim_scm_c_ptr(uc_);
+ uc = C_PTR(uc_);
assert(uc);
return uc->sc;
@@ -81,7 +81,7 @@
const char *im_encoding;
uc = retrieve_uim_context(id);
- im_encoding = uim_scm_refer_c_str(im_encoding_);
+ im_encoding = REFER_C_STR(im_encoding_);
return MAKE_BOOL(uc->conv_if->is_convertible(uc->client_encoding,
im_encoding));
}
@@ -107,8 +107,8 @@
int attr;
uc = retrieve_uim_context(uc_);
- attr = uim_scm_c_int(attr_);
- str = uim_scm_refer_c_str(str_);
+ attr = C_INT(attr_);
+ str = REFER_C_STR(str_);
converted_str = uc->conv_if->convert(uc->outbound_conv, str);
if (uc->preedit_pushback_cb)
@@ -138,7 +138,7 @@
char *converted_str;
uc = retrieve_uim_context(uc_);
- str = uim_scm_refer_c_str(str_);
+ str = REFER_C_STR(str_);
converted_str = uc->conv_if->convert(uc->outbound_conv, str);
if (uc->commit_cb)
@@ -155,7 +155,7 @@
const char *enc;
uc = retrieve_uim_context(uc_);
- enc = uim_scm_refer_c_str(enc_);
+ enc = REFER_C_STR(enc_);
if (uc->outbound_conv)
uc->conv_if->release(uc->outbound_conv);
@@ -203,7 +203,7 @@
const char *str;
uc = retrieve_uim_context(uc_);
- str = uim_scm_refer_c_str(str_);
+ str = REFER_C_STR(str_);
uc->modes = uim_realloc(uc->modes, sizeof(char *) * (uc->nr_modes + 1));
uc->modes[uc->nr_modes] = uc->conv_if->convert(uc->outbound_conv, str);
@@ -232,7 +232,7 @@
const char *prop;
uc = retrieve_uim_context(uc_);
- prop = uim_scm_refer_c_str(prop_);
+ prop = REFER_C_STR(prop_);
if (uc->propstr)
free(uc->propstr);
@@ -251,7 +251,7 @@
int mode;
uc = retrieve_uim_context(uc_);
- mode = uim_scm_c_int(mode_);
+ mode = C_INT(mode_);
uc->mode = mode;
if (uc->mode_update_cb)
@@ -268,8 +268,8 @@
int nr, display_limit;
uc = retrieve_uim_context(uc_);
- nr = uim_scm_c_int(nr_);
- display_limit = uim_scm_c_int(display_limit_);
+ nr = C_INT(nr_);
+ display_limit = C_INT(display_limit_);
if (uc->candidate_selector_activate_cb)
uc->candidate_selector_activate_cb(uc->ptr, nr, display_limit);
@@ -284,7 +284,7 @@
int idx;
uc = retrieve_uim_context(uc_);
- idx = uim_scm_c_int(idx_);
+ idx = C_INT(idx_);
if (uc->candidate_selector_select_cb)
uc->candidate_selector_select_cb(uc->ptr, idx);
@@ -301,7 +301,7 @@
int dir;
uc = retrieve_uim_context(uc_);
- dir = (uim_scm_c_bool(dir_)) ? 1 : 0;
+ dir = (C_BOOL(dir_)) ? 1 : 0;
if (uc->candidate_selector_shift_page_cb)
uc->candidate_selector_shift_page_cb(uc->ptr, dir);
@@ -338,10 +338,10 @@
if (!uc->acquire_text_cb)
return uim_scm_f();
- text_id = uim_scm_c_int(text_id_);
- origin = uim_scm_c_int(origin_);
- former_len = uim_scm_c_int(former_len_);
- latter_len = uim_scm_c_int(latter_len_);
+ text_id = C_INT(text_id_);
+ origin = C_INT(origin_);
+ former_len = C_INT(former_len_);
+ latter_len = C_INT(latter_len_);
err = uc->acquire_text_cb(uc->ptr, text_id, origin,
former_len, latter_len, &former, &latter);
@@ -378,14 +378,14 @@
if (!uc->delete_text_cb)
return uim_scm_f();
- text_id = uim_scm_c_int(text_id_);
- origin = uim_scm_c_int(origin_);
- former_len = uim_scm_c_int(former_len_);
- latter_len = uim_scm_c_int(latter_len_);
+ text_id = C_INT(text_id_);
+ origin = C_INT(origin_);
+ former_len = C_INT(former_len_);
+ latter_len = C_INT(latter_len_);
err = uc->delete_text_cb(uc->ptr, text_id, origin, former_len, latter_len);
- return uim_scm_make_bool(!err);
+ return MAKE_BOOL(!err);
}
static uim_lisp
@@ -408,7 +408,7 @@
const char *name;
uc = retrieve_uim_context(uc_);
- name = uim_scm_refer_c_str(name_);
+ name = REFER_C_STR(name_);
if (uc->switch_app_global_im_cb)
uc->switch_app_global_im_cb(uc->ptr, name);
@@ -423,7 +423,7 @@
const char *name;
uc = retrieve_uim_context(uc_);
- name = uim_scm_refer_c_str(name_);
+ name = REFER_C_STR(name_);
if (uc->switch_system_global_im_cb)
uc->switch_system_global_im_cb(uc->ptr, name);
Modified: trunk/uim/uim-key.c
==============================================================================
--- trunk/uim/uim-key.c (original)
+++ trunk/uim/uim-key.c Mon Aug 27 20:31:36 2007
@@ -294,7 +294,7 @@
char *sym;
int i;
- sym = uim_scm_refer_c_str(sym_);
+ sym = REFER_C_STR(sym_);
for (i = 0; key_tab[i].key; i++) {
if (!strcmp(key_tab[i].str, sym))
return key_tab[i].key;
@@ -312,10 +312,10 @@
valid_key_symbols = uim_scm_null();
for (i = 0; key_tab[i].key; i++) {
- valid_key_symbols = uim_scm_cons(MAKE_SYM(key_tab[i].str),
+ valid_key_symbols = CONS(MAKE_SYM(key_tab[i].str),
valid_key_symbols);
}
- uim_scm_eval(uim_scm_list3(MAKE_SYM("define"),
+ uim_scm_eval(LIST3(MAKE_SYM("define"),
MAKE_SYM("valid-key-symbols"),
QUOTE(valid_key_symbols)));
}
@@ -364,7 +364,7 @@
handler = (is_press) ? "key-press-handler" : "key-release-handler";
filtered = uim_scm_callf(handler, "poi", uc, key_, state);
- return uim_scm_c_bool(filtered);
+ return C_BOOL(filtered);
}
static int
Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c (original)
+++ trunk/uim/uim-util.c Mon Aug 27 20:31:36 2007
@@ -51,31 +51,31 @@
static uim_lisp
uim_version()
{
- return uim_scm_make_str(PACKAGE_VERSION);
+ return MAKE_STR(PACKAGE_VERSION);
}
static uim_lisp
sys_libdir()
{
- return uim_scm_make_str(LIBDIR);
+ return MAKE_STR(LIBDIR);
}
static uim_lisp
sys_pkglibdir()
{
- return uim_scm_make_str(PKGLIBDIR);
+ return MAKE_STR(PKGLIBDIR);
}
static uim_lisp
sys_datadir()
{
- return uim_scm_make_str(DATADIR);
+ return MAKE_STR(DATADIR);
}
static uim_lisp
sys_pkgdatadir()
{
- return uim_scm_make_str(PKGDATADIR);
+ return MAKE_STR(PKGDATADIR);
}
static uim_lisp
@@ -84,10 +84,10 @@
struct stat st;
const char *c_filename;
- if (!uim_scm_stringp(filename))
+ if (!STRP(filename))
return uim_scm_f();
- c_filename = uim_scm_refer_c_str(filename);
+ c_filename = REFER_C_STR(filename);
if (stat(c_filename, &st) < 0) {
return uim_scm_f();
} else {
@@ -128,21 +128,21 @@
static uim_lisp
file_mtime(uim_lisp f)
{
- const char *filename = uim_scm_refer_c_str(f);
+ const char *filename = REFER_C_STR(f);
struct stat buf;
if(stat(filename, &buf) == 0) {
- return uim_scm_make_int(buf.st_mtime);
+ return MAKE_INT(buf.st_mtime);
} else {
/* FIXME: Write error handling code. */
- return uim_scm_make_int(0);
+ return MAKE_INT(0);
}
}
static uim_lisp
c_getenv(uim_lisp str_)
{
- const char *str = uim_scm_refer_c_str(str_);
+ const char *str = REFER_C_STR(str_);
char *val;
if (!str) {
@@ -151,7 +151,7 @@
val = getenv(str);
if (val) {
- return uim_scm_make_str(val);
+ return MAKE_STR(val);
} else {
return uim_scm_f();
}
@@ -160,8 +160,8 @@
static uim_lisp
c_setenv(uim_lisp name_, uim_lisp val_, uim_lisp overwrite_)
{
- const char *name = uim_scm_refer_c_str(name_);
- const char *val = uim_scm_refer_c_str(val_);
+ const char *name = REFER_C_STR(name_);
+ const char *val = REFER_C_STR(val_);
int overwrite = TRUEP(overwrite_);
int err;
@@ -175,7 +175,7 @@
static uim_lisp
c_unsetenv(uim_lisp name_)
{
- const char *name = uim_scm_refer_c_str(name_);
+ const char *name = REFER_C_STR(name_);
if (!name) {
return uim_scm_f();
@@ -193,20 +193,20 @@
int start1;
size_t s1len;
- if (!uim_scm_stringp(s1_) || !uim_scm_stringp(s2_))
- return uim_scm_f(); /* FIXME: uim_scm_error() */
+ if (!STRP(s1_) || !STRP(s2_))
+ return uim_scm_f(); /* FIXME: ERROR() */
- s1 = uim_scm_refer_c_str(s1_);
- s2 = uim_scm_refer_c_str(s2_);
- start1 = uim_scm_c_int(start1_);
+ s1 = REFER_C_STR(s1_);
+ s2 = REFER_C_STR(s2_);
+ start1 = C_INT(start1_);
s1len = strlen(s1);
if (start1 < 0 || s1len < (size_t)start1)
- return uim_scm_f(); /* FIXME: uim_scm_error() */
+ return uim_scm_f(); /* FIXME: ERROR() */
found = strstr(&s1[start1], s2);
- return (found) ? uim_scm_make_int(found - s1) : uim_scm_f();
+ return (found) ? MAKE_INT(found - s1) : uim_scm_f();
}
static uim_lisp
@@ -216,11 +216,11 @@
const char *prefix, *str;
size_t len;
- if (!uim_scm_stringp(prefix_) || !uim_scm_stringp(str_))
+ if (!STRP(prefix_) || !STRP(str_))
return uim_scm_f();
- prefix = uim_scm_refer_c_str(prefix_);
- str = uim_scm_refer_c_str(str_);
+ prefix = REFER_C_STR(prefix_);
+ str = REFER_C_STR(str_);
len = strlen(prefix);
return (*cmp)(prefix, str, len) ? uim_scm_f() : uim_scm_t();
@@ -273,7 +273,7 @@
lang_code = uim_scm_callf("langgroup-primary-lang-code", "s", locale);
protected =
lang_name = uim_scm_callf("lang-code->lang-name", "o", lang_code);
- name = uim_scm_refer_c_str(lang_name);
+ name = REFER_C_STR(lang_name);
UIM_CATCH_ERROR_END();
@@ -294,7 +294,7 @@
protected =
lang_code = uim_scm_callf("lang-name->lang-code", "s", language_name);
- name = uim_scm_refer_c_str(lang_code);
+ name = REFER_C_STR(lang_code);
UIM_CATCH_ERROR_END();
@@ -306,7 +306,7 @@
{
assert(uim_scm_gc_any_contextp());
- return uim_scm_make_bool(uim_issetugid());
+ return MAKE_BOOL(uim_issetugid());
}
void
Modified: trunk/uim/uim.c
==============================================================================
--- trunk/uim/uim.c (original)
+++ trunk/uim/uim.c Mon Aug 27 20:31:36 2007
@@ -395,9 +395,9 @@
cand = uim_malloc(sizeof(*cand));
memset(cand, 0, sizeof(*cand));
- str = uim_scm_refer_c_str(CAR(triple));
- head = uim_scm_refer_c_str(CAR(CDR(triple)));
- ann = uim_scm_refer_c_str(CAR(CDR(CDR((triple)))));
+ str = REFER_C_STR(CAR(triple));
+ head = REFER_C_STR(CAR(CDR(triple)));
+ ann = REFER_C_STR(CAR(CDR(CDR((triple)))));
cand->str = uc->conv_if->convert(uc->outbound_conv, str);
cand->heading_label = uc->conv_if->convert(uc->outbound_conv, head);
cand->annotation = uc->conv_if->convert(uc->outbound_conv, ann);
@@ -541,7 +541,7 @@
consumed = uim_scm_callf("input-string-handler", "ps", uc, conv);
free(conv);
- ret = uim_scm_c_bool(consumed);
+ ret = C_BOOL(consumed);
} else {
ret = UIM_FALSE;
}
@@ -626,7 +626,7 @@
protected0 = im = uim_scm_callf("uim-context-im", "p", uc);
protected1 = ret = uim_scm_callf("im-name", "o", im);
- name = uim_scm_refer_c_str(ret);
+ name = REFER_C_STR(ret);
UIM_CATCH_ERROR_END();
@@ -646,7 +646,7 @@
assert(localename);
protected0 = ret = uim_scm_callf("uim-get-default-im-name", "s", localename);
- name = uim_scm_refer_c_str(ret);
+ name = REFER_C_STR(ret);
UIM_CATCH_ERROR_END();
@@ -667,7 +667,7 @@
protected0 =
ret = uim_scm_callf("uim-get-im-name-for-locale", "s", localename);
- name = uim_scm_refer_c_str(ret);
+ name = REFER_C_STR(ret);
UIM_CATCH_ERROR_END();
@@ -904,7 +904,7 @@
assert(uc);
protected0 = n_ = uim_scm_callf("uim-n-convertible-ims", "p", uc);
- n = uim_scm_c_int(n_);
+ n = C_INT(n_);
UIM_CATCH_ERROR_END();
@@ -932,7 +932,7 @@
protected0 = im = get_nth_im(uc, nth);
protected1 = str_ = uim_scm_callf("im-name", "o", im);
- str = uim_scm_refer_c_str(str_);
+ str = REFER_C_STR(str_);
UIM_CATCH_ERROR_END();
@@ -950,7 +950,7 @@
protected0 = im = get_nth_im(uc, nth);
protected1 = str_ = uim_scm_callf("im-lang", "o", im);
- str = uim_scm_refer_c_str(str_);
+ str = REFER_C_STR(str_);
UIM_CATCH_ERROR_END();
@@ -968,7 +968,7 @@
protected0 = im = get_nth_im(uc, nth);
protected1 = str_ = uim_scm_callf("im-encoding", "o", im);
- str = uim_scm_refer_c_str(str_);
+ str = REFER_C_STR(str_);
UIM_CATCH_ERROR_END();
@@ -986,7 +986,7 @@
protected0 = im = get_nth_im(uc, nth);
protected1 = short_desc = uim_scm_callf("im-short-desc", "o", im);
- str = (FALSEP(short_desc)) ? "-" : uim_scm_refer_c_str(short_desc);
+ str = (FALSEP(short_desc)) ? "-" : REFER_C_STR(short_desc);
UIM_CATCH_ERROR_END();
