Add server prefix to utst_int.xg

When compiling src/ubik/utst_int.ss.c, a warning would be produced since
the server stubs are defined as accepting an rx_connection instead of an
rx_call, and since the server and client RPC stubs have the same name.
Give a server prefix so we can distinguish between the two, and fix the
server stubs and squash the warning, similar to
bd011aeee7f5dad5c61fd81a90b296c46a0b9058.

Change-Id: Iebf843bcabb4cf8f4a56c6ac30d210573b58d801
Reviewed-on: http://gerrit.openafs.org/876
Tested-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/README.WARNINGS b/README.WARNINGS
index ca3eccc..39c39b1 100644 (file)
--- a/README.WARNINGS
+++ b/README.WARNINGS
@@ -65,7 +65,6 @@ rxkad/ticket5.c      : all           : CRC functions - maybe fixed (no errors in
 rx/rx.c                     : all (pthread) : rxkad_global_stats_init not proto'd
 rx/xdr_rx.c          : all (ukernel) : Prototypes don't match due to AFS_XDR_T 
                                       not being used in the xdr header
-ubik/utst_int_ss.c   : all           : Client / Server symbol collisions
 ubik/beacon.c        : all           : Ubik uses signed/unsigned 
                                       interchangably for IP addresses, a 
                                       fix will require API changes.

diff --git a/src/ubik/Makefile.in b/src/ubik/Makefile.in
index f220419..37578aa 100644 (file)
--- a/src/ubik/Makefile.in
+++ b/src/ubik/Makefile.in
@@ -75,8 +75,6 @@ Kubik_int.h: ubik_int.xg
        ${RXGEN} -A -x -k -h -o Kubik_int.h ${srcdir}/ubik_int.xg
 
 utst_int.ss.o: utst_int.ss.c utst_int.xdr.c
-       $(CC) $(CFLAGS) @CFLAGS_NOERROR@ -c $<
-
 utst_int.cs.o: utst_int.cs.c utst_int.xdr.c
 utst_int.xdr.o: utst_int.xdr.c utst_int.h
 

diff --git a/src/ubik/utst_int.xg b/src/ubik/utst_int.xg
index 8861174..a94540e 100644 (file)
--- a/src/ubik/utst_int.xg
+++ b/src/ubik/utst_int.xg
@@ -8,6 +8,7 @@
  */
 
 package SAMPLE_
+prefix S
 
 const  UMAXNAMELEN =   255;
 typedef string sampleName<UMAXNAMELEN>;

diff --git a/src/ubik/utst_server.c b/src/ubik/utst_server.c
index 8076fc4..ca995ae 100644 (file)
--- a/src/ubik/utst_server.c
+++ b/src/ubik/utst_server.c
@@ -38,7 +38,7 @@ afs_int32 sleepTime;
 /*\}*/
 
 int
-SAMPLE_Inc(struct rx_connection *rxconn)
+SSAMPLE_Inc(struct rx_call *call)
 {
     afs_int32 code, temp;
     struct ubik_trans *tt;
@@ -97,7 +97,7 @@ SAMPLE_Inc(struct rx_connection *rxconn)
 }
 
 int
-SAMPLE_Get(struct rx_connection *rxconn, afs_int32 *gnumber)
+SSAMPLE_Get(struct rx_call *call, afs_int32 *gnumber)
 {
     afs_int32 code, temp;
     struct ubik_trans *tt;
@@ -142,7 +142,7 @@ SAMPLE_Get(struct rx_connection *rxconn, afs_int32 *gnumber)
 }
 
 int
-SAMPLE_QGet(struct rx_connection *rxconn, afs_int32 *gnumber)
+SSAMPLE_QGet(struct rx_call *call, afs_int32 *gnumber)
 {
     afs_int32 code, temp;
     struct ubik_trans *tt;
@@ -187,7 +187,7 @@ SAMPLE_QGet(struct rx_connection *rxconn, afs_int32 *gnumber)
 }
 
 int
-SAMPLE_Trun(struct rx_connection *rxconn)
+SSAMPLE_Trun(struct rx_call *call)
 {
     afs_int32 code;
     struct ubik_trans *tt;
@@ -226,7 +226,7 @@ SAMPLE_Trun(struct rx_connection *rxconn)
 }
 
 int
-SAMPLE_Test(struct rx_connection *rxconn)
+SSAMPLE_Test(struct rx_call *call)
 {
     afs_int32 code, temp;
     struct ubik_trans *tt;