From dd9bd05baca8534b1221fe3498b1f535f66918d6 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 28 Mar 2022 16:57:15 +0300 Subject: [PATCH] [#1239] neofs-cli: Use pointer-less slices for object ID Signed-off-by: Evgenii Stratonikov --- cmd/neofs-cli/internal/client/client.go | 9 ++++----- cmd/neofs-cli/modules/object.go | 4 ++-- cmd/neofs-cli/modules/storagegroup.go | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cmd/neofs-cli/internal/client/client.go b/cmd/neofs-cli/internal/client/client.go index b275a86ca..57d6489a7 100644 --- a/cmd/neofs-cli/internal/client/client.go +++ b/cmd/neofs-cli/internal/client/client.go @@ -631,11 +631,11 @@ func (x *SearchObjectsPrm) SetFilters(filters object.SearchFilters) { // SearchObjectsRes groups resulting values of SearchObjects operation. type SearchObjectsRes struct { - ids []*oidSDK.ID + ids []oidSDK.ID } // IDList returns identifiers of the matched objects. -func (x SearchObjectsRes) IDList() []*oidSDK.ID { +func (x SearchObjectsRes) IDList() []oidSDK.ID { return x.ids } @@ -671,15 +671,14 @@ func SearchObjects(prm SearchObjectsPrm) (*SearchObjectsRes, error) { } buf := make([]oidSDK.ID, 10) - var list []*oidSDK.ID + var list []oidSDK.ID var n int var ok bool for { n, ok = rdr.Read(buf) for i := 0; i < n; i++ { - v := buf[i] - list = append(list, &v) + list = append(list, buf[i]) } if !ok { break diff --git a/cmd/neofs-cli/modules/object.go b/cmd/neofs-cli/modules/object.go index 7e2d4817b..ac5a49241 100644 --- a/cmd/neofs-cli/modules/object.go +++ b/cmd/neofs-cli/modules/object.go @@ -624,8 +624,8 @@ func searchObject(cmd *cobra.Command, _ []string) { ids := res.IDList() cmd.Printf("Found %d objects.\n", len(ids)) - for _, id := range ids { - cmd.Println(id) + for i := range ids { + cmd.Println(ids[i].String()) } } diff --git a/cmd/neofs-cli/modules/storagegroup.go b/cmd/neofs-cli/modules/storagegroup.go index b0d71b3dc..ec7739575 100644 --- a/cmd/neofs-cli/modules/storagegroup.go +++ b/cmd/neofs-cli/modules/storagegroup.go @@ -286,8 +286,8 @@ func listSG(cmd *cobra.Command, _ []string) { cmd.Printf("Found %d storage groups.\n", len(ids)) - for _, id := range ids { - cmd.Println(id) + for i := range ids { + cmd.Println(ids[i].String()) } }