Merge pull request #1 from osspkg/dev

add buffer

Author: markus621

.golangci.yml

@@ -368,7 +368,6 @@ linters:
     - errorlint
     - bodyclose
     - exportloopref
-    - gci
     - gosec
     - lll
   fast: false

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2024, Mikhail Knyazhev <markus621@yandex.com>
+Copyright (c) 2024-2025, Mikhail Knyazhev <markus621@yandex.com>
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

Makefile

@@ -23,8 +23,8 @@ build:
 tests:
 	devtool test
 
-.PHONY: pre-commite
-pre-commite: setup lint build tests
+.PHONY: pre-commit
+pre-commit: setup license lint build tests
 
 .PHONY: ci
 ci: install setup lint build tests

ascii.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 

cache/cache_simple.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/cache_time.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/cache_time_test.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import (

cache/common.go

@@ -1,3 +1,8 @@
+/*
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
+ */
+
 package cache
 
 import "time"

codec/encdec.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -31,7 +31,7 @@ type (
 	Codec struct {
 		Encode func(in interface{}) ([]byte, error)
 		Decode func(b []byte, out interface{}) error
-		Merge  func(dst map[string]interface{}, src map[string]interface{}) error
+		Merge  func(dst map[string]interface{}, src ...map[string]interface{})
 	}
 	encoders struct {
 		list map[string]Codec
@@ -54,7 +54,7 @@ func (v *encoders) Add(
 	ext string,
 	enc func(interface{}) ([]byte, error),
 	dec func([]byte, interface{}) error,
-	merge func(map[string]interface{}, map[string]interface{}) error,
+	merge func(map[string]interface{}, ...map[string]interface{}),
 ) *encoders {
 	v.mux.Lock(func() {
 		v.list[ext] = Codec{

codec/encdec_blob.go

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2024 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
+ *  Copyright (c) 2024-2025 Mikhail Knyazhev <markus621@yandex.com>. All rights reserved.
  *  Use of this source code is governed by a BSD 3-Clause license that can be found in the LICENSE file.
  */
 
@@ -53,9 +53,7 @@ func (v *BlobEncoder) Encode(configs ...interface{}) error {
 		if err = codec.Decode(bb, &tmp); err != nil {
 			return err
 		}
-		if err = codec.Merge(out, tmp); err != nil {
-			return err
-		}
+		codec.Merge(out, tmp)
 	}
 	v.Blob, err0 = codec.Encode(out)
 	return err0