[gift-checkins] CVS: giFT/src/rpc proc_search.c,1.1.2.13,1.1.2.14 proc_xdr.c,1.1.2.20,1.1.2.21 proc_xdr.h,1.1.2.18,1.1.2.19

[Josh G. <ja...@us...>]

Update of /cvsroot/gift/giFT/src/rpc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4328/src/rpc

Modified Files:
      Tag: dev-gift-0_12_0
	proc_search.c proc_xdr.c proc_xdr.h 
Log Message:
changed GIFT_searchresult_t::obj to search_obj to match query.x

Index: proc_search.c
===================================================================
RCS file: /cvsroot/gift/giFT/src/rpc/Attic/proc_search.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -d -r1.1.2.13 -r1.1.2.14
--- proc_search.c	3 May 2004 05:21:09 -0000	1.1.2.13
+++ proc_search.c	14 May 2004 23:51:46 -0000	1.1.2.14
@@ -270,8 +270,8 @@
 static bool fill_result_arg (GIFT_searchresult_t *result,
                              struct searchobj *sobj, struct resultobj *robj)
 {
-	result->obj.data = &sobj;
-	result->obj.size = sizeof (sobj);
+	result->search_obj.data = &sobj;
+	result->search_obj.size = sizeof (sobj);
 
 	result->result_obj.data = &robj;
 	result->result_obj.size = sizeof (robj);

Index: proc_xdr.c
===================================================================
RCS file: /cvsroot/gift/giFT/src/rpc/Attic/proc_xdr.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- proc_xdr.c	5 May 2004 04:50:50 -0000	1.1.2.20
+++ proc_xdr.c	14 May 2004 23:51:46 -0000	1.1.2.21
@@ -529,7 +529,7 @@
 
 bool gi_xdr_GIFT_searchresult_t (GiXdr *xdrs, GIFT_searchresult_t *objp)
 {
-	if (gi_xdr_GIFT_searchobj_t (xdrs, &objp->obj) == false)
+	if (gi_xdr_GIFT_searchobj_t (xdrs, &objp->search_obj) == false)
 		return false;
 
 	if (gi_xdr_GIFT_resultobj_t (xdrs, &objp->result_obj) == false)

Index: proc_xdr.h
===================================================================
RCS file: /cvsroot/gift/giFT/src/rpc/Attic/proc_xdr.h,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- proc_xdr.h	3 May 2004 05:21:09 -0000	1.1.2.18
+++ proc_xdr.h	14 May 2004 23:51:46 -0000	1.1.2.19
@@ -300,7 +300,7 @@
 
 struct GIFT_searchresult_t
 {
-	GIFT_searchobj_t obj;
+	GIFT_searchobj_t search_obj;
 	GIFT_resultobj_t result_obj;
 	GIFT_protostr_t  proto;
 	GIFT_hashes_t    hash;