summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main.go1
-rw-r--r--sort.go8
2 files changed, 7 insertions, 2 deletions
diff --git a/main.go b/main.go
index de1b12d..d9c32e2 100644
--- a/main.go
+++ b/main.go
@@ -114,6 +114,7 @@ func main() {
if err := addMutex(sortmap); err == nil {
log.Info("adding mutex to existing protoc-gen-go file worked")
sortmap["mutex"] = "true"
+ sortmap["lock"] = "all"
} else {
log.Info("adding mutex to existing protoc-gen-go file did not work")
sortmap["mutex"] = "false"
diff --git a/sort.go b/sort.go
index 12e1181..0b884d9 100644
--- a/sort.go
+++ b/sort.go
@@ -13,7 +13,12 @@ func makeSortfile() {
f, _ := os.OpenFile(sortmap["protobase"]+".sort.pb.go", os.O_WRONLY|os.O_CREATE, 0600)
header(f, sortmap)
- syncLock(f, sortmap)
+
+ if sortmap["lock"] == "all" {
+ // if the lock is set to 'all' this means the mutex was put in the protoc-gen-go struct
+ } else {
+ syncLock(f, sortmap)
+ }
iterTop(f, sortmap)
iterNext(f, sortmap)
iterAppend(f, sortmap) // Append() enforce no unique keys
@@ -190,7 +195,6 @@ func iterEnd(w io.Writer, names map[string]string) {
fmt.Fprintln(w, "")
fmt.Fprintln(w, " return aStuff")
fmt.Fprintln(w, "}")
- fmt.Fprintln(w, "")
}
func iterAppend(w io.Writer, names map[string]string) {