diff options
| author | Congcong Kuo <[email protected]> | 2025-05-27 01:49:56 +0800 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2025-05-28 19:31:45 +0200 |
| commit | 583e0688e33c4f3d7e3f1e2f30dd78690eb58fd4 (patch) | |
| tree | 4540726ce9e891cce45887e2459de173436d6b62 /nix/libutil/util.cc | |
| parent | c29534228ff9ac74e8c6a0e80356c21adbff9887 (diff) | |
daemon: Remove ‘AutoDeleteArray’.
* 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 <[email protected]>
Diffstat (limited to 'nix/libutil/util.cc')
| -rw-r--r-- | nix/libutil/util.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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()); } |