From 583e0688e33c4f3d7e3f1e2f30dd78690eb58fd4 Mon Sep 17 00:00:00 2001
From: Congcong Kuo <congcong.kuo@gmail.com>
Date: Tue, 27 May 2025 01:49:56 +0800
Subject: daemon: Remove ‘AutoDeleteArray’.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* libutil/util.hh (AutoDeleteArray): Remove.
* libutil/util.cc (readString, readStrings): Use ‘std::vector’ instead
of ‘AutoDeleteArray’.
* libutil/serialise.cc (readFile): Likewise.

Change-Id: I45362998dbb8226874f66b77cd19f071f7bb2ab3
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 nix/libutil/util.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'nix/libutil/util.cc')

diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index 56f116046c..398f61841f 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -271,11 +271,10 @@ string readFile(int fd)
     if (fstat(fd, &st) == -1)
         throw SysError("statting file");
 
-    unsigned char * buf = new unsigned char[st.st_size];
-    AutoDeleteArray<unsigned char> d(buf);
-    readFull(fd, buf, st.st_size);
+    std::vector<unsigned char> buf(st.st_size);
+    readFull(fd, buf.data(), buf.size());
 
-    return string((char *) buf, st.st_size);
+    return string((char *) buf.data(), buf.size());
 }
 
 
-- 
cgit v1.2.3