d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

back out 1.7 changes, unneeded and possibly wrong.

Browse Source
This commit is contained in:
Alfred Perlstein 2005-02-10 10:44:29 +00:00
parent de8eca17df
commit ed5769e305
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
usr.bin/rpcgen/rpc_tblout.c
View File

@ -55,13 +55,11 @@ __FBSDID("$FreeBSD$");
static char tabstr[TABCOUNT+1] = "\t\t\t\t\t"; static char tabstr[TABCOUNT+1] = "\t\t\t\t\t";
static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n"; static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n";
static char tbl_end[] = "\n};\n"; static char tbl_end[] = "};\n";
static char null_entry[] = "\n\t{\n\ static char null_entry[] = "\n\t(char *(*)())0,\n\
\tNULL,\n\
\t(xdrproc_t) xdr_void,\t\t\t0,\n\ \t(xdrproc_t) xdr_void,\t\t\t0,\n\
\t(xdrproc_t) xdr_void,\t\t\t0,\n\ \t(xdrproc_t) xdr_void,\t\t\t0,\n";
\t}";
static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n"; static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n";
@ -121,7 +119,7 @@ write_table(def)
} }
expected = current + 1; expected = current + 1;
} }
f_print(fout, ",\n\n\t{\n\tRPCGEN_ACTION("); f_print(fout, "\n\t(char *(*)())RPCGEN_ACTION(");
/* routine to invoke */ /* routine to invoke */
if( Cflag && !newstyle ) if( Cflag && !newstyle )
@ -142,7 +140,6 @@ write_table(def)
proc->args.decls->decl.type ); proc->args.decls->decl.type );
/* result info */ /* result info */
printit(proc->res_prefix, proc->res_type); printit(proc->res_prefix, proc->res_type);
f_print(fout, "\t}");
} }
/* print the table trailer */ /* print the table trailer */
@ -160,7 +157,7 @@ printit(prefix, type)
int tabs; int tabs;
len = fprintf(fout, "\t(xdrproc_t) xdr_%s,", stringfix(type)); len = fprintf(fout, "\txdr_%s,", stringfix(type));
/* account for leading tab expansion */ /* account for leading tab expansion */
len += TABSIZE - 1; len += TABSIZE - 1;
/* round up to tabs required */ /* round up to tabs required */
@ -170,7 +167,7 @@ printit(prefix, type)
if (streq(type, "void")) { if (streq(type, "void")) {
f_print(fout, "0"); f_print(fout, "0");
} else { } else {
f_print(fout, " sizeof ( "); f_print(fout, "sizeof ( ");
/* XXX: should "follow" be 1 ??? */ /* XXX: should "follow" be 1 ??? */
ptype(prefix, type, 0); ptype(prefix, type, 0);
f_print(fout, ")"); f_print(fout, ")");