diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | localedata/charmaps/UTF-8 (renamed from localedata/charmaps/UTF8) | 0 | ||||
| -rw-r--r-- | sunrpc/rpc_cout.c | 10 |
3 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index d02e9acc11..70e4454550 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2000-06-30 Ulrich Drepper <drepper@redhat.com> + * sunrpc/rpc_cout.c (inline_struct): Add missing braces in + generated expressions. + Patch by Darren McClelland <dmcclell@zetec.com>. + * timezone/Makefile (build-testdata): Set LANGUAGE and LC_ALL since zic uses setlocale and gettext but we cannot make it use the new locale data since zic calls a shell which might not use the diff --git a/localedata/charmaps/UTF8 b/localedata/charmaps/UTF-8 index c19822a872..c19822a872 100644 --- a/localedata/charmaps/UTF8 +++ b/localedata/charmaps/UTF-8 diff --git a/sunrpc/rpc_cout.c b/sunrpc/rpc_cout.c index a8471cacc9..808a5053cd 100644 --- a/sunrpc/rpc_cout.c +++ b/sunrpc/rpc_cout.c @@ -524,11 +524,11 @@ inline_struct (definition *def, int flag) f_print (fout, "buf = XDR_INLINE (xdrs, %d * BYTES_PER_XDR_UNIT);", size); else if (size == 0) f_print (fout, - "buf = XDR_INLINE (xdrs, %s * BYTES_PER_XDR_UNIT);", + "buf = XDR_INLINE (xdrs, (%s) * BYTES_PER_XDR_UNIT);", sizestr); else f_print (fout, - "buf = XDR_INLINE(xdrs, (%d + (%s)) * BYTES_PER_XDR_UNIT);", + "buf = XDR_INLINE (xdrs, (%d + (%s)) * BYTES_PER_XDR_UNIT);", size, sizestr); f_print (fout, "\n"); tabify (fout, indent + 1); @@ -573,15 +573,15 @@ inline_struct (definition *def, int flag) /* were already looking at a xdr_inlineable structure */ if (sizestr == NULL) f_print (fout, - "\t\tbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);", + "\t\tbuf = XDR_INLINE (xdrs, %d * BYTES_PER_XDR_UNIT);", size); else if (size == 0) f_print (fout, - "\t\tbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);", + "\t\tbuf = XDR_INLINE (xdrs, (%s) * BYTES_PER_XDR_UNIT);", sizestr); else f_print (fout, - "\t\tbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);", + "\t\tbuf = XDR_INLINE (xdrs, (%d + %s)* BYTES_PER_XDR_UNIT);", size, sizestr); f_print (fout, "\n\t\tif (buf == NULL) {\n"); psav = cur; |