diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-28 13:39:42 -0700 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2023-01-29 02:14:51 -0700 |
| commit | 636311bafdb18da9851a668317a8d792f38ead5b (patch) | |
| tree | 0dbd3ac35fb4f54487600f3ea19964043ea011bf | |
| parent | 2824310168b9dbe24c2d47cfb71d4283b1733642 (diff) | |
Move the base64 decode to the internal package
| -rw-r--r-- | decode.go | 4 | ||||
| -rw-r--r-- | internal/base64.go (renamed from base64.go) | 6 | ||||
| -rw-r--r-- | internal/base64_test.go (renamed from base64_test.go) | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -669,13 +669,13 @@ func (dec *Decoder) decode(val reflect.Value, nullOK bool) { case internal.RuneTypeStringBeg: if typ.Elem() == byteType { var buf bytes.Buffer - dec.decodeString(typ, newBase64Decoder(&buf)) + dec.decodeString(typ, internal.NewBase64Decoder(&buf)) val.Set(reflect.ValueOf(buf.Bytes())) } else { // TODO: Surely there's a better way. At the very least, we should // avoid buffering. var buf bytes.Buffer - dec.decodeString(typ, newBase64Decoder(&buf)) + dec.decodeString(typ, internal.NewBase64Decoder(&buf)) bs := buf.Bytes() val.Set(reflect.MakeSlice(typ, len(bs), len(bs))) for i := 0; i < len(bs); i++ { diff --git a/base64.go b/internal/base64.go index 86fc293..15adbf4 100644 --- a/base64.go +++ b/internal/base64.go @@ -1,8 +1,8 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> +// Copyright (C) 2022-2023 Luke Shumaker <lukeshu@lukeshu.com> // // SPDX-License-Identifier: GPL-2.0-or-later -package lowmemjson +package internal import ( "encoding/base64" @@ -19,7 +19,7 @@ type base64Decoder struct { bufLen int } -func newBase64Decoder(w io.Writer) io.WriteCloser { +func NewBase64Decoder(w io.Writer) io.WriteCloser { return &base64Decoder{ dst: w, } diff --git a/base64_test.go b/internal/base64_test.go index 43367af..f18bcd7 100644 --- a/base64_test.go +++ b/internal/base64_test.go @@ -1,8 +1,8 @@ -// Copyright (C) 2022 Luke Shumaker <lukeshu@lukeshu.com> +// Copyright (C) 2022-2023 Luke Shumaker <lukeshu@lukeshu.com> // // SPDX-License-Identifier: GPL-2.0-or-later -package lowmemjson +package internal import ( "bytes" @@ -23,7 +23,7 @@ func b64encode(t *testing.T, input []byte) []byte { func b64decode(t *testing.T, input []byte) []byte { var decoded bytes.Buffer - dec := newBase64Decoder(&decoded) + dec := NewBase64Decoder(&decoded) _, err := dec.Write(input) require.NoError(t, err) require.NoError(t, dec.Close()) |