From 3b03a7a42ca8d71f8a6c68133cadb6faf358f712 Mon Sep 17 00:00:00 2001 From: bnewbold Date: Wed, 18 Apr 2012 23:18:04 -0400 Subject: refactor BomStub to BomMeta --- formats.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'formats.go') diff --git a/formats.go b/formats.go index fb7f573..e24c0ae 100644 --- a/formats.go +++ b/formats.go @@ -1,6 +1,6 @@ package main -// Bom/BomStub conversion/dump/load routines +// Bom/BomMeta conversion/dump/load routines import ( "encoding/csv" @@ -14,7 +14,7 @@ import ( // --------------------- text (CLI only ) ----------------------- -func DumpBomAsText(bs *BomStub, b *Bom, out io.Writer) { +func DumpBomAsText(bs *BomMeta, b *Bom, out io.Writer) { fmt.Fprintln(out) fmt.Fprintf(out, "%s (version %s, created %s)\n", bs.Name, b.Version, b.Created) fmt.Fprintf(out, "Creator: %s\n", bs.Owner) @@ -81,7 +81,7 @@ func LoadBomFromCSV(out io.Writer) (*Bom, error) { // --------------------- JSON ----------------------- -func DumpBomAsJSON(bs *BomStub, b *Bom, out io.Writer) { +func DumpBomAsJSON(bs *BomMeta, b *Bom, out io.Writer) { obj := map[string]interface{}{ "bom_meta": bs, @@ -94,9 +94,9 @@ func DumpBomAsJSON(bs *BomStub, b *Bom, out io.Writer) { } } -func LoadBomFromJSON(input io.Reader) (*BomStub, *Bom, error) { +func LoadBomFromJSON(input io.Reader) (*BomMeta, *Bom, error) { - bs := &BomStub{} + bs := &BomMeta{} b := &Bom{} obj := map[string]interface{}{ @@ -120,7 +120,7 @@ func LoadBomFromJSON(input io.Reader) (*BomStub, *Bom, error) { // --------------------- XML ----------------------- -func DumpBomAsXML(bs *BomStub, b *Bom, out io.Writer) { +func DumpBomAsXML(bs *BomMeta, b *Bom, out io.Writer) { enc := xml.NewEncoder(out) if err := enc.Encode(bs); err != nil { @@ -131,9 +131,9 @@ func DumpBomAsXML(bs *BomStub, b *Bom, out io.Writer) { } } -func LoadBomFromXML(input io.Reader) (*BomStub, *Bom, error) { +func LoadBomFromXML(input io.Reader) (*BomMeta, *Bom, error) { - bs := BomStub{} + bs := BomMeta{} b := Bom{} enc := xml.NewDecoder(input) -- cgit v1.2.3