summaryrefslogtreecommitdiff
path: root/usr.bin/rpcgen/rpc_clntout.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/rpcgen/rpc_clntout.c')
-rw-r--r--usr.bin/rpcgen/rpc_clntout.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/usr.bin/rpcgen/rpc_clntout.c b/usr.bin/rpcgen/rpc_clntout.c
index d2be67e1e3a..2d704c12062 100644
--- a/usr.bin/rpcgen/rpc_clntout.c
+++ b/usr.bin/rpcgen/rpc_clntout.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rpc_clntout.c,v 1.9 2002/02/16 21:27:51 millert Exp $ */
+/* $OpenBSD: rpc_clntout.c,v 1.10 2002/06/01 01:40:38 deraadt Exp $ */
/* $NetBSD: rpc_clntout.c,v 1.4 1995/06/11 21:49:52 pk Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -59,9 +59,9 @@ write_stubs()
list *l;
definition *def;
- f_print(fout,
+ fprintf(fout,
"\n/* Default timeout can be changed using clnt_control() */\n");
- f_print(fout, "static struct timeval TIMEOUT = { %d, 0 };\n",
+ fprintf(fout, "static struct timeval TIMEOUT = { %d, 0 };\n",
DEFAULT_TIMEOUT);
for (l = defined; l != NULL; l = l->next) {
def = (definition *) l->val;
@@ -80,14 +80,14 @@ write_program(def)
for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) {
for (proc = vp->procs; proc != NULL; proc = proc->next) {
- f_print(fout, "\n");
+ fprintf(fout, "\n");
ptype(proc->res_prefix, proc->res_type, 1);
- f_print(fout, "*\n");
+ fprintf(fout, "*\n");
pvname(proc->proc_name, vp->vers_num);
printarglist( proc, "clnt", "CLIENT *" );
- f_print(fout, "{\n");
+ fprintf(fout, "{\n");
printbody(proc);
- f_print(fout, "}\n");
+ fprintf(fout, "}\n");
}
}
}
@@ -108,42 +108,42 @@ void printarglist( proc, addargname, addargtype )
if (!newstyle) { /* old style: always pass argument by reference */
if (Cflag) { /* C++ style heading */
- f_print(fout, "(");
+ fprintf(fout, "(");
ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
- f_print(fout, "*argp, %s%s)\n", addargtype, addargname );
+ fprintf(fout, "*argp, %s%s)\n", addargtype, addargname );
} else {
- f_print(fout, "(argp, %s)\n", addargname);
- f_print(fout, "\t");
+ fprintf(fout, "(argp, %s)\n", addargname);
+ fprintf(fout, "\t");
ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
- f_print(fout, "*argp;\n");
+ fprintf(fout, "*argp;\n");
}
} else if (streq( proc->args.decls->decl.type, "void")) {
/* newstyle, 0 argument */
if (Cflag)
- f_print(fout, "(%s%s)\n", addargtype, addargname );
+ fprintf(fout, "(%s%s)\n", addargtype, addargname );
else
- f_print(fout, "(%s)\n", addargname);
+ fprintf(fout, "(%s)\n", addargname);
} else {
/* new style, 1 or multiple arguments */
if (!Cflag) {
- f_print(fout, "(");
+ fprintf(fout, "(");
for (l = proc->args.decls; l != NULL; l = l->next)
- f_print(fout, "%s, ", l->decl.name);
- f_print(fout, "%s)\n", addargname );
+ fprintf(fout, "%s, ", l->decl.name);
+ fprintf(fout, "%s)\n", addargname );
for (l = proc->args.decls; l != NULL; l = l->next) {
pdeclaration(proc->args.argname, &l->decl, 1, ";\n" );
}
} else { /* C++ style header */
- f_print(fout, "(");
+ fprintf(fout, "(");
for(l = proc->args.decls; l != NULL; l = l->next) {
pdeclaration(proc->args.argname, &l->decl, 0, ", " );
}
- f_print(fout, " %s%s)\n", addargtype, addargname );
+ fprintf(fout, " %s%s)\n", addargtype, addargname );
}
}
if (!Cflag)
- f_print(fout, "\t%s%s;\n", addargtype, addargname );
+ fprintf(fout, "\t%s%s;\n", addargtype, addargname );
}
@@ -169,42 +169,42 @@ printbody(proc)
/* For new style with multiple arguments, need a structure in which
to stuff the arguments. */
if ( newstyle && args2) {
- f_print(fout, "\t%s", proc->args.argname);
- f_print(fout, " arg;\n");
+ fprintf(fout, "\t%s", proc->args.argname);
+ fprintf(fout, " arg;\n");
}
- f_print(fout, "\tstatic ");
+ fprintf(fout, "\tstatic ");
if (streq(proc->res_type, "void")) {
- f_print(fout, "char ");
+ fprintf(fout, "char ");
} else {
ptype(proc->res_prefix, proc->res_type, 0);
}
- f_print(fout, "%s;\n",RESULT);
- f_print(fout, "\n");
- f_print(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
+ fprintf(fout, "%s;\n",RESULT);
+ fprintf(fout, "\n");
+ fprintf(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
ampr(proc->res_type ), RESULT, RESULT);
if (newstyle && !args2 && (streq( proc->args.decls->decl.type, "void"))) {
/* newstyle, 0 arguments */
- f_print(fout,
+ fprintf(fout,
"\tif (clnt_call(clnt, %s, xdr_void", proc->proc_name);
- f_print(fout,
+ fprintf(fout,
", NULL, xdr_%s, %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
stringfix(proc->res_type), ampr(proc->res_type), RESULT);
} else if ( newstyle && args2) {
/* newstyle, multiple arguments: stuff arguments into structure */
for (l = proc->args.decls; l != NULL; l = l->next) {
- f_print(fout, "\targ.%s = %s;\n",
+ fprintf(fout, "\targ.%s = %s;\n",
l->decl.name, l->decl.name);
}
- f_print(fout,
+ fprintf(fout,
"\tif (clnt_call(clnt, %s, xdr_%s", proc->proc_name,
proc->args.argname);
- f_print(fout,
+ fprintf(fout,
", &arg, xdr_%s, %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
stringfix(proc->res_type),
ampr(proc->res_type), RESULT);
} else { /* single argument, new or old style */
- f_print(fout,
+ fprintf(fout,
"\tif (clnt_call(clnt, %s, xdr_%s, %s%s, xdr_%s, %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
proc->proc_name,
stringfix(proc->args.decls->decl.type),
@@ -213,13 +213,13 @@ printbody(proc)
stringfix(proc->res_type),
ampr(proc->res_type),RESULT);
}
- f_print(fout, "\t\treturn (NULL);\n");
- f_print(fout, "\t}\n");
+ fprintf(fout, "\t\treturn (NULL);\n");
+ fprintf(fout, "\t}\n");
if (streq(proc->res_type, "void")) {
- f_print(fout, "\treturn ((void *)%s%s);\n",
+ fprintf(fout, "\treturn ((void *)%s%s);\n",
ampr(proc->res_type),RESULT);
} else {
- f_print(fout, "\treturn (%s%s);\n", ampr(proc->res_type),RESULT);
+ fprintf(fout, "\treturn (%s%s);\n", ampr(proc->res_type),RESULT);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 00:12:55 +0000