summaryrefslogtreecommitdiff
path: root/sunrpc/rpc_clntout.c
diff options
context:
space:
mode:
Diffstat (limited to 'sunrpc/rpc_clntout.c')
-rw-r--r--sunrpc/rpc_clntout.c223
1 files changed, 155 insertions, 68 deletions
diff --git a/sunrpc/rpc_clntout.c b/sunrpc/rpc_clntout.c
index fb086047ba..0b4f645c07 100644
--- a/sunrpc/rpc_clntout.c
+++ b/sunrpc/rpc_clntout.c
@@ -60,9 +60,9 @@ write_stubs (void)
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)
{
@@ -84,14 +84,23 @@ write_program (definition * def)
{
for (proc = vp->procs; proc != NULL; proc = proc->next)
{
- f_print (fout, "\n");
- ptype (proc->res_prefix, proc->res_type, 1);
- f_print (fout, "*\n");
- pvname (proc->proc_name, vp->vers_num);
- printarglist (proc, "clnt", "CLIENT *");
- f_print (fout, "{\n");
+ fprintf (fout, "\n");
+ if (mtflag == 0)
+ {
+ ptype (proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*\n");
+ pvname (proc->proc_name, vp->vers_num);
+ printarglist (proc, RESULT, "clnt", "CLIENT *");
+ }
+ else
+ {
+ fprintf (fout, "enum clnt_stat \n");
+ pvname (proc->proc_name, vp->vers_num);
+ printarglist (proc, RESULT, "clnt", "CLIENT *");
+ }
+ fprintf (fout, "{\n");
printbody (proc);
- f_print (fout, "}\n");
+ fprintf (fout, "}\n");
}
}
}
@@ -104,67 +113,109 @@ write_program (definition * def)
/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */
void
-printarglist (proc_list * proc,
+printarglist (proc_list * proc, const char *result,
const char *addargname, const char *addargtype)
{
decl_list *l;
if (!newstyle)
- { /* old style: always pass argument by reference */
+ { /* old style: always pass argument by reference */
if (Cflag)
{ /* C++ style heading */
- f_print (fout, "(");
- ptype (proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
- f_print (fout, "*argp, %s%s)\n", addargtype, addargname);
+ fprintf (fout, "(");
+ ptype (proc->args.decls->decl.prefix,
+ proc->args.decls->decl.type, 1);
+
+ if (mtflag)
+ {/* Generate result field */
+ fprintf (fout, "*argp, ");
+ ptype(proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*%s, %s%s)\n", result, addargtype, addargname);
+ }
+ else
+ fprintf (fout, "*argp, %s%s)\n", addargtype, addargname);
}
else
{
- f_print (fout, "(argp, %s)\n", addargname);
- f_print (fout, "\t");
- ptype (proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1);
- f_print (fout, "*argp;\n");
+ if (!mtflag)
+ fprintf (fout, "(argp, %s)\n", addargname);
+ else
+ fprintf (fout, "(argp, %s, %s)\n", result, addargname);
+ fprintf (fout, "\t");
+ ptype (proc->args.decls->decl.prefix,
+ proc->args.decls->decl.type, 1);
+ fprintf (fout, "*argp;\n");
+ if (mtflag)
+ {
+ fprintf (fout, "\t");
+ ptype (proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*%s;\n", result);
+ }
}
}
else if (streq (proc->args.decls->decl.type, "void"))
{
/* newstyle, 0 argument */
- if (Cflag)
- f_print (fout, "(%s%s)\n", addargtype, addargname);
+ if (mtflag)
+ {
+ fprintf (fout, "(");
+ if (Cflag)
+ {
+ ptype(proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*%s, %s%s)\n", result, addargtype, addargname);
+ }
+ else
+ fprintf (fout, "(%s)\n", addargname);
+ }
+ else if (Cflag)
+ 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);
+ if (mtflag)
+ fprintf (fout, "%s, ", result);
+ fprintf (fout, "%s)\n", addargname);
for (l = proc->args.decls; l != NULL; l = l->next)
{
pdeclaration (proc->args.argname, &l->decl, 1, ";\n");
}
+ if (mtflag)
+ {
+ fprintf (fout, "\t");
+ ptype (proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*%s;\n", result);
+ }
}
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);
+ if (mtflag)
+ {
+ ptype (proc->res_prefix, proc->res_type, 1);
+ fprintf (fout, "*%s, ", result);
+ }
+ 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);
}
-
static
const char *
ampr (const char *type)
@@ -190,66 +241,102 @@ printbody (proc_list * proc)
to stuff the arguments. */
if (newstyle && args2)
{
- f_print (fout, "\t%s", proc->args.argname);
- f_print (fout, " arg;\n");
- }
- f_print (fout, "\tstatic ");
- if (streq (proc->res_type, "void"))
- {
- f_print (fout, "char ");
+ fprintf (fout, "\t%s", proc->args.argname);
+ fprintf (fout, " arg;\n");
}
- else
+ if (!mtflag)
{
- ptype (proc->res_prefix, proc->res_type, 0);
+ fprintf (fout, "\tstatic ");
+ if (streq (proc->res_type, "void"))
+ {
+ fprintf (fout, "char ");
+ }
+ else
+ {
+ ptype (proc->res_prefix, proc->res_type, 0);
+ }
+ fprintf (fout, "%s;\n", RESULT);
+ fprintf (fout, "\n");
+ fprintf (fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n",
+ ampr (proc->res_type), RESULT, RESULT);
}
- f_print (fout, "%s;\n", RESULT);
- f_print (fout, "\n");
- f_print (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,
- "\tif (clnt_call(clnt, %s, xdr_void", proc->proc_name);
- f_print (fout,
- ", NULL, xdr_%s, %s,%s, TIMEOUT) != RPC_SUCCESS) {\n",
- stringfix (proc->res_type), ampr (proc->res_type), RESULT);
+ if (mtflag)
+ fprintf (fout, "\t return ");
+ else
+ fprintf (fout, "\t if ");
+ fprintf (fout,
+ "(clnt_call (clnt, %s, (xdrproc_t) xdr_void", proc->proc_name);
+ fprintf (fout,
+ "(caddr_t) NULL,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,",
+ stringfix(proc->res_type), (mtflag)?"":ampr(proc->res_type),
+ RESULT);
+ if (mtflag)
+ fprintf (fout, "\n\t\tTIMEOUT));\n}\n");
+ else
+ fprintf (fout, "\n\t\tTIMEOUT) != RPC_SUCCESS) {\n");
}
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,
- "\tif (clnt_call(clnt, %s, xdr_%s", proc->proc_name,
+ if (mtflag)
+ fprintf (fout, "\treturn ");
+ else
+ fprintf (fout, "\tif ");
+
+ fprintf (fout,
+ "(clnt_call (clnt, %s, (xdrproc_t) xdr_%s", proc->proc_name,
proc->args.argname);
- f_print (fout,
- ", &arg, xdr_%s, %s%s, TIMEOUT) != RPC_SUCCESS) {\n",
- stringfix (proc->res_type), ampr (proc->res_type), RESULT);
+ fprintf (fout,
+ ", (caddr_t) &arg,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,",
+ stringfix(proc->res_type), (mtflag)?"":ampr(proc->res_type),
+ RESULT);
+ if (mtflag)
+ fprintf (fout, "\n\t\tTIMEOUT));\n");
+ else
+ fprintf (fout, "\n\t\tTIMEOUT) != RPC_SUCCESS) {\n");
}
else
{ /* single argument, new or old style */
- f_print (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),
- (newstyle ? "&" : ""),
- (newstyle ? proc->args.decls->decl.name : "argp"),
- stringfix (proc->res_type), ampr (proc->res_type), RESULT);
- }
- f_print (fout, "\t\treturn (NULL);\n");
- f_print (fout, "\t}\n");
- if (streq (proc->res_type, "void"))
- {
- f_print (fout, "\treturn ((void *)%s%s);\n",
- ampr (proc->res_type), RESULT);
+ if (!mtflag)
+ fprintf (fout,
+ "\tif (clnt_call (clnt, %s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\tTIMEOUT) != RPC_SUCCESS) {\n",
+ proc->proc_name,
+ stringfix (proc->args.decls->decl.type),
+ (newstyle ? "&" : ""),
+ (newstyle ? proc->args.decls->decl.name : "argp"),
+ stringfix (proc->res_type), ampr (proc->res_type),
+ RESULT);
+ else
+ fprintf(fout,
+ "\treturn (clnt_call(clnt, %s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\t(xdrproc_t) xdr_%s, (caddr_t) %s%s,\n\t\tTIMEOUT));\n",
+ proc->proc_name,
+ stringfix (proc->args.decls->decl.type),
+ (newstyle ? "&" : ""),
+ (newstyle ? proc->args.decls->decl.name : "argp"),
+ stringfix (proc->res_type), "",
+ RESULT);
}
- else
+ if (!mtflag)
{
- f_print (fout, "\treturn (%s%s);\n", ampr (proc->res_type), RESULT);
+ fprintf (fout, "\t\treturn (NULL);\n");
+ fprintf (fout, "\t}\n");
+ if (streq (proc->res_type, "void"))
+ {
+ fprintf (fout, "\treturn ((void *)%s%s);\n",
+ ampr (proc->res_type), RESULT);
+ }
+ else
+ {
+ fprintf (fout, "\treturn (%s%s);\n", ampr (proc->res_type), RESULT);
+ }
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 20:21:05 +0000