[uim commit] r4872 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Mon Aug 20 05:44:02 2007
New Revision: 4872

Modified:
   trunk/uim/uim-scm.c
   trunk/uim/uim-scm.h

Log:
* uim/uim-scm.h
  - (uim_scm_array2list): Rename arg 'size' to 'len'
* uim/uim-scm.c
  - (struct array2list_args): Rename member 'size' to 'len'
  - (uim_scm_array2list): Rename arg 'size' to 'len'
  - (uim_scm_array2list_internal): Follow the renamings


Modified: trunk/uim/uim-scm.c
==============================================================================
--- trunk/uim/uim-scm.c (original)
+++ trunk/uim/uim-scm.c Mon Aug 20 05:44:02 2007
@@ -100,7 +100,7 @@
 static char *uim_scm_symbol_value_str_internal(const char *symbol_str);
 struct array2list_args {
   void **ary;
-  size_t size;
+  size_t len;
   uim_lisp (*conv)(void *);
 };
 static void *uim_scm_array2list_internal(struct array2list_args *args);
@@ -704,15 +704,16 @@
 
 /* Pass through uim_lisp if (conv == NULL). */
 uim_lisp
-uim_scm_array2list(void **ary, size_t size, uim_lisp (*conv)(void *))
+uim_scm_array2list(void **ary, size_t len, uim_lisp (*conv)(void *))
 {
   struct array2list_args args;
 
   assert(uim_scm_gc_any_contextp());
+  assert(len < SCM_INT_T_MAX);
   assert(conv || !conv);
 
   args.ary = ary;
-  args.size = size;
+  args.len = len;
   args.conv = conv;
 
   return 
(uim_lisp)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_array2list_internal,
 &args);
@@ -721,7 +722,7 @@
 static void *
 uim_scm_array2list_internal(struct array2list_args *args)
 {
-  return (void *)scm_array2list(args->ary, args->size,
+  return (void *)scm_array2list(args->ary, args->len,
                                (ScmObj (*)(void *))args->conv);
 }
 

Modified: trunk/uim/uim-scm.h
==============================================================================
--- trunk/uim/uim-scm.h (original)
+++ trunk/uim/uim-scm.h Mon Aug 20 05:44:02 2007
@@ -197,7 +197,7 @@
                        uim_lisp elm4, uim_lisp elm5);
 
 /* C array <-> Scheme list converters */
-uim_lisp uim_scm_array2list(void **ary, size_t size, uim_lisp (*conv)(void *));
+uim_lisp uim_scm_array2list(void **ary, size_t len, uim_lisp (*conv)(void *));
 uim_lisp uim_scm_null_term_array2list(void **ary, uim_lisp (*conv)(void *));
 void **uim_scm_list2null_term_array(uim_lisp lst, void *(*conv)(uim_lisp));