aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2017-08-18 11:28:02 +0200
committerAndy Wingo <wingo@igalia.com>2017-08-18 11:31:28 +0200
commited464f48efd80e6439441d7a9f6d0e7988fb1272 (patch)
tree1464385bca764cad4414f90605c35cffcc458562
parent842e0e439a22081be1b4fed7ddc21d6d228afd10 (diff)
downloadpatches-ed464f48efd80e6439441d7a9f6d0e7988fb1272.tar
patches-ed464f48efd80e6439441d7a9f6d0e7988fb1272.tar.gz
nix: Remove unused function.
* nix/libutil/util.hh: * nix/libutil/util.cc (decodeOctalEscaped): Remove unused and buggy function.
-rw-r--r--nix/libutil/util.cc15
-rw-r--r--nix/libutil/util.hh6
2 files changed, 0 insertions, 21 deletions
diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc
index c07754487e..768e12b5e4 100644
--- a/nix/libutil/util.cc
+++ b/nix/libutil/util.cc
@@ -1106,21 +1106,6 @@ bool endOfList(std::istream & str)
}
-string decodeOctalEscaped(const string & s)
-{
- string r;
- for (string::const_iterator i = s.begin(); i != s.end(); ) {
- if (*i != '\\') { r += *i++; continue; }
- unsigned char c = 0;
- ++i;
- while (i != s.end() && *i >= '0' && *i < '8')
- c = c * 8 + (*i++ - '0');
- r += c;
- }
- return r;
-}
-
-
void ignoreException()
{
try {
diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh
index e84d64d10a..6a6e07c478 100644
--- a/nix/libutil/util.hh
+++ b/nix/libutil/util.hh
@@ -356,12 +356,6 @@ string parseString(std::istream & str);
bool endOfList(std::istream & str);
-/* Escape a string that contains octal-encoded escape codes such as
- used in /etc/fstab and /proc/mounts (e.g. "foo\040bar" decodes to
- "foo bar"). */
-string decodeOctalEscaped(const string & s);
-
-
/* Exception handling in destructors: print an error message, then
ignore the exception. */
void ignoreException();