@@ -170,34 +170,10 @@ type Proc struct {
170170WriteStreamIdx int // The index of read stream in function argument list
171171}
172172
173- // ProcMetaGenerate is a type for flags from @generate annotation
174- type ProcMetaGenerate int
175-
176- // @generate annotation can be none, client, server or both
177- const (
178- ProcMetaGenerateNone ProcMetaGenerate = iota
179- ProcMetaGenerateClient
180- ProcMetaGenerateServer
181- ProcMetaGenerateBoth
182- )
183-
184- // ProcMetaPriority is a type for values from @priority annotation
185- type ProcMetaPriority int
186-
187- // @priority annotation can be low or high
188- const (
189- ProcMetaPriorityLow ProcMetaPriority = iota
190- ProcMetaPriorityHigh
191- )
192-
193173// ProcMeta holds information from annotations attached to a libvirt procedure
194174type ProcMeta struct {
195- Generate ProcMetaGenerate
196175ReadStream int
197176WriteStream int
198- Priority ProcMetaPriority
199- Acls []string
200- Aclfilter string
201177}
202178
203179type structStack []* Structure
@@ -671,42 +647,19 @@ func parseMeta(meta string) (*ProcMeta, error) {
671647return nil ,fmt .Errorf ("invalid annotation: %s" ,meta )
672648}
673649spl [1 ]= strings .Trim (spl [1 ]," " )
674- if spl [0 ]== "generate" {
675- if spl [1 ]== "none" {
676- res .Generate = ProcMetaGenerateNone
677- }else if spl [1 ]== "client" {
678- res .Generate = ProcMetaGenerateClient
679- }else if spl [1 ]== "server" {
680- res .Generate = ProcMetaGenerateServer
681- }else if spl [1 ]== "both" {
682- res .Generate = ProcMetaGenerateBoth
683- }else {
684- return nil ,fmt .Errorf ("invalid value for generate: %s" ,spl [1 ])
685- }
686- }else if spl [0 ]== "readstream" {
650+ switch spl [0 ] {
651+ case "readstream" :
687652var err error
688653res .ReadStream ,err = strconv .Atoi (spl [1 ])
689654if err != nil {
690- return nil ,fmt .Errorf ("invalid value forreadstread : %s" ,spl [1 ])
655+ return nil ,fmt .Errorf ("invalid value forreadstream : %s" ,spl [1 ])
691656}
692- } else if spl [ 0 ] == "writestream" {
657+ case "writestream" :
693658var err error
694659res .WriteStream ,err = strconv .Atoi (spl [1 ])
695660if err != nil {
696- return nil ,fmt .Errorf ("invalid value for readstread: %s" ,spl [1 ])
697- }
698- }else if spl [0 ]== "priority" {
699- if spl [1 ]== "low" {
700- res .Priority = ProcMetaPriorityLow
701- }else if spl [1 ]== "high" {
702- res .Priority = ProcMetaPriorityHigh
703- }else {
704- return nil ,fmt .Errorf ("invalid value for priority: %s" ,spl [1 ])
661+ return nil ,fmt .Errorf ("invalid value for writestream: %s" ,spl [1 ])
705662}
706- }else if spl [0 ]== "acl" {
707- res .Acls = append (res .Acls ,spl [1 ])
708- }else if spl [0 ]== "aclfilter" {
709- res .Aclfilter = spl [1 ]
710663}
711664}
712665return res ,nil