From 16e270ac2cb843ebe305a687344ad09a37545234 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Sat, 23 Jun 2001 16:14:37 +0000 Subject: [PATCH] convert-rxgen-to-afsconfig-20010623 switch to afsconfig for some configuration; add RCSID --- src/rxgen/Makefile | 2 +- src/rxgen/rpc_clntout.c | 10 +++------- src/rxgen/rpc_cout.c | 9 +++++++-- src/rxgen/rpc_hout.c | 4 ++++ src/rxgen/rpc_main.c | 30 ++++++++++++++++++------------ src/rxgen/rpc_parse.c | 10 ++++++---- src/rxgen/rpc_scan.c | 9 +++++++-- src/rxgen/rpc_svcout.c | 11 ++++++----- src/rxgen/rpc_util.c | 9 +++++++++ src/rxgen/rpc_util.h | 7 ------- 10 files changed, 61 insertions(+), 40 deletions(-) diff --git a/src/rxgen/Makefile b/src/rxgen/Makefile index bac5c93db..bf186b869 100644 --- 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 40f52dcc4..01394d916 100644 --- 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 +#include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) #include -#else -#include -#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 0b2820eb4..e529e8b44 100644 --- a/src/rxgen/rpc_cout.c +++ b/src/rxgen/rpc_cout.c @@ -33,15 +33,20 @@ * Copyright (C) 1987, Sun Microsystems, Inc. */ #include +#include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) +#include +#ifdef HAVE_STRING_H #include -#else +#endif +#ifdef HAVE_STRINGS_H #include #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 5c7853bc5..8c21bce21 100644 --- 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 +#include #include #include #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 640f81ed5..01ad71b1c 100644 --- a/src/rxgen/rpc_main.c +++ b/src/rxgen/rpc_main.c @@ -34,24 +34,29 @@ */ #include +#include #include #include -#ifdef AFS_AIX32_ENV -#include -#endif +#include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) +#ifdef HAVE_STRING_H #include -#else +#endif +#ifdef HAVE_STRINGS_H #include #endif -#ifndef AFS_NT40_ENV +#ifdef HAVE_SIGNAL_H +#include +#endif +#ifdef HAVE_SYS_FILE_H #include #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 0d6a7fc36..6656e33bb 100644 --- a/src/rxgen/rpc_parse.c +++ b/src/rxgen/rpc_parse.c @@ -33,20 +33,22 @@ * Copyright (C) 1987 Sun Microsystems, Inc. */ #include +#include +#include #include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) #include -#if defined(AFS_SUN5_ENV) -#include +#ifdef HAVE_STRING_H +#include #endif -#else +#ifdef HAVE_STRINGS_H #include #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 385c79a27..d2d390d0d 100644 --- a/src/rxgen/rpc_scan.c +++ b/src/rxgen/rpc_scan.c @@ -33,16 +33,21 @@ * Copyright (C) 1987, Sun Microsystems, Inc. */ #include +#include #include +#include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) +#ifdef HAVE_STRING_H #include -#else +#endif +#ifdef HAVE_STRINGS_H #include #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 839522771..5724ba813 100644 --- 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 +#include #include -#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV) +#ifdef HAVE_STRING_H #include -#else +#endif +#ifdef HAVE_STRINGS_H #include #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 971c2ec90..4b7ce3a36 100644 --- a/src/rxgen/rpc_util.c +++ b/src/rxgen/rpc_util.c @@ -33,11 +33,20 @@ * Copyright (C) 1987, Sun Microsystems, Inc. */ #include +#include #include +#ifdef HAVE_STRING_H +#include +#endif +#ifdef HAVE_STRINGS_H +#include +#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 3df9ca36d..501e9bd57 100644 --- 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)) -- 2.39.5