about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-07-01 04:35:11 +0000
committerUlrich Drepper <drepper@redhat.com>2000-07-01 04:35:11 +0000
commitb856f875e8b72c48ef9b983b702f614615fc80b3 (patch)
tree01919d8f7a40b528f80d9bafe68aa27cac66b8b6
parent71d82dbe9e2e3345de641259dbacb8d45b0801a3 (diff)
downloadglibc-b856f875e8b72c48ef9b983b702f614615fc80b3.tar.gz
glibc-b856f875e8b72c48ef9b983b702f614615fc80b3.tar.xz
glibc-b856f875e8b72c48ef9b983b702f614615fc80b3.zip
Update.
	* sunrpc/rpc_cout.c (inline_struct): Add missing braces in
	generated expressions.
	Patch by Darren McClelland <dmcclell@zetec.com>.
-rw-r--r--ChangeLog4
-rw-r--r--localedata/charmaps/UTF-8 (renamed from localedata/charmaps/UTF8)0
-rw-r--r--sunrpc/rpc_cout.c10
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;