From ee586e0ec492d818be9aa0c77dd44095d42f486f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 1 Dec 1998 11:25:26 +0000 Subject: Update. 1998-12-01 Thorsten Kukuk * sunrpc/auth_des.c: Use new XDR int32 functions for integers. * sunrpc/rpc/xdr.h: Add IXDR INT32 functions. * sunrpc/rpc_hout.c: Remove (u_long) casts in defines to avoid conflicts with new solaris version. * sunrpc/rpc_main.c: Fix bug in generating Makefile name (malloc doesn't zero allocated memory). * sunrpc/rpc_svcout.c: Local variables now starts with a _ to avoid conflicts with xdr functions. Solves PR libc/877. * nis/rpcsvc/nis.x: Use always uint32_t. * nis/rpcsvc/nis.h: Likewise. * nis/rpcsvc/nis_object.x: Likewise. 1998-12-01 Ulrich Drepper * math/libm-test.c: Various cleanups. Patch by Zack Weinberg. * sysdeps/unix/sysv/linux/alpha/setfpucw.c: Use correct type for parameter. Patch by Christian Gafton. * string/envz.h: Add prototype for envz_remove. Reported by Andreas Jaeger. --- sunrpc/rpc_svcout.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sunrpc/rpc_svcout.c') diff --git a/sunrpc/rpc_svcout.c b/sunrpc/rpc_svcout.c index 2869d3d844..aad9412884 100644 --- a/sunrpc/rpc_svcout.c +++ b/sunrpc/rpc_svcout.c @@ -72,10 +72,10 @@ static void p_xdrfunc (const char *rname, const char *typename) { if (Cflag) - f_print (fout, "\t\txdr_%s = (xdrproc_t) xdr_%s;\n", rname, + f_print (fout, "\t\t_xdr_%s = (xdrproc_t) xdr_%s;\n", rname, stringfix (typename)); else - f_print (fout, "\t\txdr_%s = xdr_%s;\n", rname, stringfix (typename)); + f_print (fout, "\t\t_xdr_%s = xdr_%s;\n", rname, stringfix (typename)); } void @@ -503,7 +503,7 @@ write_program (const definition * def, const char *storage) if (Cflag) { - f_print (fout, "\txdrproc_t xdr_%s, xdr_%s;\n", ARG, RESULT); + f_print (fout, "\txdrproc_t _xdr_%s, _xdr_%s;\n", ARG, RESULT); if (mtflag) f_print(fout, "\tbool_t (*%s)(char *, void *, struct svc_req *);\n", @@ -619,11 +619,11 @@ write_program (const definition * def, const char *storage) RETVAL, ROUTINE, ARG, RESULT, RQSTP); if (mtflag) f_print(fout, - "\tif (%s > 0 && !svc_sendreply(%s, xdr_%s, (char *)&%s)) {\n", + "\tif (%s > 0 && !svc_sendreply(%s, _xdr_%s, (char *)&%s)) {\n", RETVAL, TRANSP, RESULT, RESULT); else f_print(fout, - "\tif (%s != NULL && !svc_sendreply(%s, xdr_%s, %s)) {\n", + "\tif (%s != NULL && !svc_sendreply(%s, _xdr_%s, %s)) {\n", RESULT, TRANSP, RESULT, RESULT); printerr ("systemerr", TRANSP); @@ -643,7 +643,7 @@ write_program (const definition * def, const char *storage) { f_print(fout,"\tif (!"); pvname(def->def_name, vp->vers_num); - f_print(fout,"_freeresult (%s, xdr_%s, (caddr_t) &%s))\n", + f_print(fout,"_freeresult (%s, _xdr_%s, (caddr_t) &%s))\n", TRANSP, RESULT, RESULT); (void) sprintf(_errbuf, "unable to free results"); print_err_message("\t\t"); @@ -664,7 +664,7 @@ static void printif (const char *proc, const char *transp, const char *prefix, const char *arg) { - f_print (fout, "\tif (!svc_%s (%s, xdr_%s, %s%s)) {\n", + f_print (fout, "\tif (!svc_%s (%s, _xdr_%s, %s%s)) {\n", proc, transp, arg, prefix, arg); } -- cgit 1.4.1