convert-rxgen-to-afsconfig-20010623

switch to afsconfig for some configuration; add RCSID

diff --git a/src/rxgen/Makefile b/src/rxgen/Makefile
index bac5c93dbe2d5b7102164b2f012fcbbe33c40bf6..bf186b869423e4dfac77d2fb456096be4e1647bd 100644 (file)
--- a/src/rxgen/Makefile
+++ b/src/rxgen/Makefile
@@ -18,7 +18,7 @@ OBJS= rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o rpc_scan.o rpc_util.o \
        rpc_svcout.o rpc_clntout.o
 
 GOAL=rxgen
-CFLAGS = ${DBUG} -I. -I${DESTDIR}include ${XCFLAGS}
+CFLAGS = ${DBUG} -I. -I${DESTDIR}include -I${TOP_SRCDIR}/config ${XCFLAGS}
 
 USNS=cellname
 SD=../../../src/CML

diff --git a/src/rxgen/rpc_clntout.c b/src/rxgen/rpc_clntout.c
index 40f52dcc458b8cd54ebb821ca39c5de638f180c9..01394d916b9cfb72db60fe2943ed11876422afa6 100644 (file)
--- a/src/rxgen/rpc_clntout.c
+++ b/src/rxgen/rpc_clntout.c
@@ -27,24 +27,20 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#ifndef lint
-static char sccsid[] = "@(#)rpc_clntout.c 1.2 87/06/24 (C) 1987 SMI";
-#endif
 
 /*
  * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler
  * Copyright (C) 1987, Sun Microsytsems, Inc.
  */
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
 #include <string.h>
-#else
-#include <strings.h>
-#endif
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
+RCSID("$Header$");
+
 #define DEFAULT_TIMEOUT 25     /* in seconds */
 
 static write_program();

diff --git a/src/rxgen/rpc_cout.c b/src/rxgen/rpc_cout.c
index 0b2820eb4970e22df58fa9f6f63fe1dc357de543..e529e8b449dce5af27f58a1de7b36016f89c1932 100644 (file)
--- a/src/rxgen/rpc_cout.c
+++ b/src/rxgen/rpc_cout.c
@@ -33,15 +33,20 @@
  * Copyright (C) 1987, Sun Microsystems, Inc. 
  */
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
+#include <stdlib.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
-#else
+#endif
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #include "rpc_util.h"
 #include "rpc_parse.h"
 
+RCSID("$Header$");
+
 static print_header();
 static print_trailer();
 static space();

diff --git a/src/rxgen/rpc_hout.c b/src/rxgen/rpc_hout.c
index 5c7853bc500f017c06adf6ccd766843fa66ff83e..8c21bce219feb89d3f7176725e662f0de7c7c9d7 100644 (file)
--- a/src/rxgen/rpc_hout.c
+++ b/src/rxgen/rpc_hout.c
@@ -32,11 +32,15 @@
  * rpc_hout.c, Header file outputter for the RPC protocol compiler 
  * Copyright (C) 1987, Sun Microsystems, Inc. 
  */
+#include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "rpc_util.h"
 #include "rpc_parse.h"
 
+RCSID("$Header$");
+
 static pconstdef();
 static pstructdef();
 static puniondef();

diff --git a/src/rxgen/rpc_main.c b/src/rxgen/rpc_main.c
index 640f81ed56486bb799f9023b712011e71f849979..01ad71b1ca4fe5c9822d5a76c5a25b4563f641d8 100644 (file)
--- a/src/rxgen/rpc_main.c
+++ b/src/rxgen/rpc_main.c
@@ -34,24 +34,29 @@
  */
 
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <limits.h>
 #include <stdio.h>
-#ifdef AFS_AIX32_ENV
-#include <signal.h>
-#endif
+#include <stdlib.h>
 #include <ctype.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
+#ifdef HAVE_STRING_H
 #include <string.h>
-#else
+#endif
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
-#ifndef AFS_NT40_ENV
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
 #endif
 #include "rpc_util.h"
 #include "rpc_parse.h"
 #include "rpc_scan.h"
 
+RCSID("$Header$");
+
 #define EXTEND 1               /* alias for TRUE */
 
 struct commandline {
@@ -120,17 +125,18 @@ static char *XTRA_CPPFLAGS[] = {
 };
 #endif
 
-static c_output();
-static h_output();
-static s_output();
-static l_output();
-static do_registers();
-static parseargs();
+static int c_output();
+static int h_output();
+static int s_output();
+static int l_output();
+static int do_registers();
+static int parseargs();
 
 static int allc = sizeof(allv)/sizeof(allv[0]);
 
 #include "AFS_component_version_number.c"
 
+int
 main(argc, argv)
        int argc;
        char *argv[];

diff --git a/src/rxgen/rpc_parse.c b/src/rxgen/rpc_parse.c
index 0d6a7fc36852dd97de221496d9c82cd47149644c..6656e33bb354267d70e268a0e9e6fdac729e583f 100644 (file)
--- a/src/rxgen/rpc_parse.c
+++ b/src/rxgen/rpc_parse.c
@@ -33,20 +33,22 @@
  * Copyright (C) 1987 Sun Microsystems, Inc.
  */
 #include <afs/param.h>
+#include <afsconfig.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
 #include <string.h>
-#if defined(AFS_SUN5_ENV)
-#include <strings.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
 #endif
-#else
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #include "rpc_util.h"
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 
+RCSID("$Header$");
 
 list *proc_defined[MAX_PACKAGES], *special_defined, *typedef_defined, *uniondef_defined;
 char *SplitStart = NULL;

diff --git a/src/rxgen/rpc_scan.c b/src/rxgen/rpc_scan.c
index 385c79a273ac87ededde5bd59d31ef910544702d..d2d390d0d5358d3fb8f91948a7e8502e8b552042 100644 (file)
--- a/src/rxgen/rpc_scan.c
+++ b/src/rxgen/rpc_scan.c
@@ -33,16 +33,21 @@
  * Copyright (C) 1987, Sun Microsystems, Inc. 
  */
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
+#ifdef HAVE_STRING_H
 #include <string.h>
-#else
+#endif
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #include "rpc_scan.h"
 #include "rpc_util.h"
 
+RCSID("$Header$");
+
 #define startcomment(where) (where[0] == '/' && where[1] == '*')
 #define endcomment(where) (where[-1] == '*' && where[0] == '/')
 #define        verbatimstart(p) (*(p) == '@' && *((p) + 1) == '{')

diff --git a/src/rxgen/rpc_svcout.c b/src/rxgen/rpc_svcout.c
index 8395227714d4f8448bccd188d12c38901c6df14a..5724ba8136375048966ef00ad5864ddb7a62cf9c 100644 (file)
--- a/src/rxgen/rpc_svcout.c
+++ b/src/rxgen/rpc_svcout.c
@@ -27,24 +27,25 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
-#ifndef lint
-static char sccsid[] = "@(#)rpc_svcout.c 1.6 87/06/24 (C) 1987 SMI";
-#endif
 
 /*
  * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler
  * Copyright (C) 1987, Sun Microsytsems, Inc. 
  */
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
+#ifdef HAVE_STRING_H
 #include <string.h>
-#else
+#endif
+#ifdef HAVE_STRINGS_H
 #include <strings.h>
 #endif
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
+RCSID("$Header$");
+
 static char RQSTP[] = "rqstp";
 static char TRANSP[] = "transp";
 static char ARG[] = "argument";

diff --git a/src/rxgen/rpc_util.c b/src/rxgen/rpc_util.c
index 971c2ec9051556b3d3ce93f3db8569beb2c4f134..4b7ce3a36dc094c121fa2ad9dc959b9033835ee4 100644 (file)
--- a/src/rxgen/rpc_util.c
+++ b/src/rxgen/rpc_util.c
@@ -33,11 +33,20 @@
  * Copyright (C) 1987, Sun Microsystems, Inc. 
  */
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <stdio.h>
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 #include "rpc_util.h"
 
+RCSID("$Header$");
+
 char curline[MAXLINESIZE];     /* current read line */
 char *where = curline; /* current point in line */
 int linenum = 0;       /* current line number */

diff --git a/src/rxgen/rpc_util.h b/src/rxgen/rpc_util.h
index 3df9ca36d96668249dce4c8a9dea08f8250f14b5..501e9bd5714da3e30ec2695d3eb7b89be5a3a0bd 100644 (file)
--- a/src/rxgen/rpc_util.h
+++ b/src/rxgen/rpc_util.h
@@ -34,13 +34,6 @@
  */
 
 #include "rxgen_consts.h"
-#ifndef AFS_NT40_ENV
-#ifdef AFS_OSF_ENV
-extern void *malloc();
-#else
-extern char *malloc();
-#endif /* osf */
-#endif /* nt40 */
 #define alloc(size)            malloc((unsigned)(size))
 #define ALLOC(object)   (object *) malloc(sizeof(object))