refactor(3p/nix/libutil): Replace string2Int & trim functions r/843

Replaces these functions with corresponding functions from Abseil,
namely absl::StripAsciiWhitespace and absl::SimpleAtoi.

In the course of doing this some minor things I encountered along the
way were also refactored.

This also changes the signatures of the various custom readFile
functions to use absl::string_view types.

1 files changed, 2 insertions, 1 deletions

diff --git a/third_party/nix/src/libstore/local-store.cc b/third_party/nix/src/libstore/local-store.cc
index 84055740de2c..faea0fbce56a 100644
--- a/third_party/nix/src/libstore/local-store.cc
+++ b/third_party/nix/src/libstore/local-store.cc
@@ -7,6 +7,7 @@
 #include <ctime>
 #include <iostream>
 
+#include <absl/strings/numbers.h>
 #include <fcntl.h>
 #include <glog/logging.h>
 #include <grp.h>
@@ -295,7 +296,7 @@ int LocalStore::getSchema() {
   int curSchema = 0;
   if (pathExists(schemaPath)) {
     std::string s = readFile(schemaPath);
-    if (!string2Int(s, curSchema)) {
+    if (!absl::SimpleAtoi(s, &curSchema)) {
       throw Error(format("'%1%' is corrupt") % schemaPath);
     }
   }