From 66ba61dbed05d27cd6cb632364d568f5d7eb4063 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 7 Oct 2015 17:45:00 +0200 Subject: Simplify --- ber/class.go | 9 +++++---- ber/dump.go | 12 +++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ber/class.go b/ber/class.go index 50ada25..5cc0603 100644 --- a/ber/class.go +++ b/ber/class.go @@ -114,9 +114,10 @@ var tagNames = map[Tag]string{ func (t Tag) String() string { return tagNames[t] } func (h Header) String() string { - f := "%v %v %v" - if h.Class != classUniversal { - f = "%v %v %d" + switch h.Class { + case classUniversal: + return fmt.Sprint(h.Tag) + default: + return fmt.Sprintf("%v %d", h.Class, h.Tag) } - return fmt.Sprintf(f, h.Class, h.Kind, h.Tag) } diff --git a/ber/dump.go b/ber/dump.go index fd1e45b..d207366 100644 --- a/ber/dump.go +++ b/ber/dump.go @@ -36,18 +36,12 @@ func (s *state) dump(indent int) (ret string) { case kindPrimitive: switch h.Class { case classUniversal: - ret += fmt.Sprintln(h.Tag, "=", s.universal(h)) + ret += fmt.Sprintln(h, "=", s.universal(h)) default: - ret += fmt.Sprintln(h.Class, int(h.Tag), "=", - s.next()) + ret += fmt.Sprintln(h, "=", s.next()) } case kindConstructed: - switch h.Class { - case classUniversal: - ret += fmt.Sprintln(h.Tag, "→") - default: - ret += fmt.Sprintln(h.Class, int(h.Tag), "→") - } + ret += fmt.Sprintln(h, "→") ret += s.subState().dump(indent + 1) } } -- cgit v1.2.3