X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Frx%2Ftest%2Ftestserver.c;h=12289196c1c26a615c55ff5bb6b9613270f16891;hp=dd812e0dea90a7eebec70a2a916d924ea99ed2e5;hb=75aacd6a10b1ebd426907268aa584bdd1be61833;hpb=5c77a6ca2460c3e79125a614037824db35480905

diff --git a/src/rx/test/testserver.c b/src/rx/test/testserver.c
index dd812e0..1228919 100644
--- a/src/rx/test/testserver.c
+++ b/src/rx/test/testserver.c
@@ -11,7 +11,7 @@
 
 #include <afsconfig.h>
 #include <afs/param.h>
-
+#include <roken.h>
 
 #include <sys/types.h>
 #include <stdio.h>
@@ -28,10 +28,10 @@
 #endif
 #include <signal.h>
 #include <sys/stat.h>
-#include "rx_clock.h"
-#include "rx.h"
-#include "rx_globals.h"
-#include "rx_null.h"
+#include <rx/rx_clock.h>
+#include <rx/rx.h>
+#include <rx/rx_globals.h>
+#include <rx/rx_null.h>
 
 int error;			/* Return this error number on a call */
 int print = 0, eventlog = 0, rxlog = 0;
@@ -40,8 +40,8 @@ FILE *debugFile;
 char *rcvFile;
 int logstdout = 0;
 
-void Abort(char *msg, int a, int b, int c, int d, int e);
-void Quit(char *msg, int a, int b, int c, int d, int e);
+void Abort(char *msg, ...);
+void Quit(char *msg);
 void OpenFD(int n);
 int  FileRequest(struct rx_call *call);
 int  SimpleRequest(struct rx_call *call);
@@ -49,7 +49,7 @@ int  SimpleRequest(struct rx_call *call);
 void
 intSignal(int ignore)
 {
-    Quit("Interrupted",0,0,0,0,0);
+    Quit("Interrupted");
 }
 
 void
@@ -57,7 +57,7 @@ quitSignal(int ignore)
 {
     static int quitCount = 0;
     if (++quitCount > 1)
-	Quit("rx_ctest: second quit signal, aborting",0,0,0,0,0);
+	Quit("rx_ctest: second quit signal, aborting");
     rx_debugFile = debugFile = fopen("rx_stest.db", "w");
     if (debugFile)
 	rx_PrintStats(debugFile);
@@ -150,7 +150,7 @@ main(argc, argv)
 	argv++, argc--;
     }
     if (err || argc != 0)
-	Quit("usage: rx_stest [-silent] [-rxlog] [-eventlog]",0,0,0,0,0);
+	Quit("usage: rx_stest [-silent] [-rxlog] [-eventlog]");
 
     if (rxlog || eventlog) {
 	if (logstdout)
@@ -158,7 +158,7 @@ main(argc, argv)
 	else
 	    debugFile = fopen("rx_stest.db", "w");
 	if (debugFile == NULL)
-	    Quit("Couldn't open rx_stest.db",0,0,0,0,0);
+	    Quit("Couldn't open rx_stest.db");
 	if (rxlog)
 	    rx_debugFile = debugFile;
 	if (eventlog)
@@ -195,7 +195,7 @@ main(argc, argv)
 			    1,	/*Execute request */
 			    rcvFile ? FileRequest : SimpleRequest);
     if (!service)
-	Abort("rx_NewService returned 0!\n",0,0,0,0,0);
+	Abort("rx_NewService returned 0!\n");
 
     rx_SetMinProcs(service, 2);
     rx_SetMaxProcs(service, 100);
@@ -227,7 +227,7 @@ int SimpleRequest(struct rx_call *call)
 	    t.tv_usec = computeTime.usec;
 #ifdef AFS_PTHREAD_ENV
 	    if (select(0, 0, 0, 0, &t) != 0)
-		Quit("Select didn't return 0",0,0,0,0,0);
+		Quit("Select didn't return 0");
 #else
 	    IOMGR_Sleep(t.tv_sec);
 #endif
@@ -291,7 +291,7 @@ FileRequest(struct rx_call *call)
     while (nbytes = rx_Read(call, buffer, blockSize)) {
 	if (write(fd, buffer, nbytes) != nbytes) {
 	    perror("writev");
-	    Abort("Write Failed.\n",0,0,0,0,0);
+	    Abort("Write Failed.\n");
 	    break;
 	}
     }
@@ -306,22 +306,27 @@ FileRequest(struct rx_call *call)
 }
 
 void
-Abort(char *msg, int a, int b, int c, int d, int e)
+Abort(char *msg, ...)
 {
-    printf((char *)msg, a, b, c, d, e);
+    va_list args;
+
+    va_start(args, msg);
+    printf((char *)msg, args);
+    va_end(args);
+
     printf("\n");
     if (debugFile) {
 	rx_PrintStats(debugFile);
 	fflush(debugFile);
     }
-    abort();
+    afs_abort();
+    exit(1);
 }
 
 void
-Quit(char *msg, int a, int b, int c, int d, int e)
+Quit(char *msg)
 {
-    printf((char *)msg, a, b, c, d, e);
-    printf("\n");
+    printf("%s\n", msg);
     if (debugFile) {
 	rx_PrintStats(debugFile);
 	fflush(debugFile);