===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/io/ox_asir.c,v
retrieving revision 1.67
retrieving revision 1.71
diff -u -p -r1.67 -r1.71
--- OpenXM_contrib2/asir2000/io/ox_asir.c	2010/04/23 04:44:52	1.67
+++ OpenXM_contrib2/asir2000/io/ox_asir.c	2013/06/13 18:42:11	1.71
@@ -44,7 +44,7 @@
  * OF THE SOFTWARE HAS BEEN DEVELOPED BY A THIRD PARTY, THE THIRD PARTY
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
- * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.66 2008/11/27 08:27:04 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/io/ox_asir.c,v 1.70 2011/01/13 08:00:07 noro Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -122,7 +122,7 @@ void ox_mpi_master_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 }
 
@@ -135,7 +135,7 @@ void ox_mpi_slave_init() {
 		/* ordering information is not exchanged */
 		/* idx should be equal to i */
 		idx = get_iofp(i,0,0);
-		register_server(0,idx,idx);
+		register_server(0,idx,idx,-1);
 	}
 	asir_OperandStackSize = BUFSIZ;
 	asir_OperandStack = (Obj *)CALLOC(asir_OperandStackSize,sizeof(Obj));
@@ -646,7 +646,7 @@ void asir_pops()
 void asir_setName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	char *dummy = "=0;";
 	SNODE snode;
 	ERR err;
@@ -668,7 +668,7 @@ void asir_setName(unsigned int serial)
 void asir_evalName(unsigned int serial)
 {
 	char *name;
-	int l,n;
+	size_t l,n;
 	SNODE snode;
 	ERR err;
 	pointer val;
@@ -793,11 +793,7 @@ static void asir_executeFunction(int serial)
 #endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
-			searchf(sysf,func,&f); 
-		if ( !f )
-			searchf(ubinf,func,&f);
-		if ( !f )
-			searchf(usrf,func,&f);
+			gen_searchf_searchonly(func,&f); 
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
 			goto error;
@@ -871,11 +867,7 @@ static void asir_executeFunctionSync(int serial)
 #endif
 		searchf(noargsysf,func,&f);
 		if ( !f )
-			searchf(sysf,func,&f); 
-		if ( !f )
-			searchf(ubinf,func,&f);
-		if ( !f )
-			searchf(usrf,func,&f);
+			gen_searchf_searchonly(func,&f); 
 		if ( !f ) {
 			sprintf(buf,"executeFunction : the function %s not found",func);
 			goto error;
@@ -1081,7 +1073,7 @@ void ox_io_init() {
 	read_char(iofp[0].in,&rc);
 	iofp[0].conv = c == rc ? 0 : 1;
 	/* XXX; for raw I/O */
-	register_server(0,0,0);
+	register_server(0,0,0,-1);
 }
 
 #if !defined(VISUAL)