From: Russ Cox <rsc@golang.org>
Date: Mon, 13 Dec 2010 20:50:47 +0000 (-0500)
Subject: godefs: guard against structs with pad fields
X-Git-Tag: weekly.2010-12-15~41
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=318c1eeb32834045adc7d4e46d5616fd041a8c9e;p=gostls13.git

godefs: guard against structs with pad fields

Fixes #1162.

R=r
CC=golang-dev
https://golang.org/cl/3619041
---

diff --git a/src/cmd/godefs/main.c b/src/cmd/godefs/main.c
index d31d298a5e..cdecd6e8d8 100644
--- a/src/cmd/godefs/main.c
+++ b/src/cmd/godefs/main.c
@@ -133,7 +133,7 @@ Lang go =
 
 	"type %s struct {\n",
 	"type %s struct {\n",
-	"\tPad%d [%d]byte;\n",
+	"\tPad_godefs_%d [%d]byte;\n",
 	"}\n",
 
 	gotypefmt,
@@ -150,7 +150,7 @@ Lang c =
 
 	"typedef struct %s %s;\nstruct %s {\n",
 	"typedef union %s %s;\nunion %s {\n",
-	"\tbyte pad%d[%d];\n",
+	"\tbyte pad_godefs_%d[%d];\n",
 	"};\n",
 
 	ctypefmt,
@@ -391,7 +391,7 @@ Continue:
 				if(cutprefix(name))
 					name += prefix;
 				if(strcmp(name, "") == 0) {
-					snprint(nambuf, sizeof nambuf, "Pad%d", npad++);
+					snprint(nambuf, sizeof nambuf, "Pad_godefs_%d", npad++);
 					name = nambuf;
 				}
 				Bprint(bout, "\t%#lT;\n", name, f->type);