kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace skipPast with strings.TrimPrefix.

Browse Source 
There was a bug in skipPast; it was skipping to the start of the string,
rather than the end of it. But more of an issue is that it would skip if
it was in the middle of the string, which caused problems when
STACK_OF(FOO) was used as a parameter.

At some point, we'll probably need to give this a real C declaration
parser. We still have declarations (like those that return function
pointers) which we can't parse. But for now let's clear the low-hanging
fruit.

Change-Id: Ic2cee452cc8cf6887a6ff1b00cea353cec361955
Reviewed-on: https://boringssl-review.googlesource.com/5875
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
David Benjamin 2015-09-13 01:16:50 -04:00 committed by Adam Langley
parent ee0c82789a
commit 361ecc0236
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
util/doc.go
View File

@ -189,14 +189,6 @@ func extractDecl(lines []string, lineNo int) (decl string, rest []string, restLi
return
}
func skipPast(s, skip string) string {
i := strings.Index(s, skip)
if i > 0 {
return s[i:]
}
return s
}
func skipLine(s string) string {
i := strings.Index(s, "\n")
if i > 0 {
@ -224,8 +216,9 @@ func getNameFromDecl(decl string) (string, bool) {
}
return decl[:i], true
}
decl = skipPast(decl, "STACK_OF(")
decl = skipPast(decl, "LHASH_OF(")
decl = strings.TrimPrefix(decl, "OPENSSL_EXPORT ")
decl = strings.TrimPrefix(decl, "STACK_OF(")
decl = strings.TrimPrefix(decl, "LHASH_OF(")
i := strings.Index(decl, "(")
if i < 0 {
return "", false