From 6bb4e3e8fe30a09d174a04295ba074ee006ebb4f Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 18 Aug 2017 11:07:00 +0200 Subject: [PATCH] Remove unused decodeOctalEscaped Besides being unused, this function has a bug that it will incorrectly decode the path component Ubuntu\04016.04.2\040LTS\040amd64 as "Ubuntu.04.2 LTS amd64" instead of "Ubuntu 16.04.2 LTS amd64". --- src/libutil/util.cc | 15 --------------- src/libutil/util.hh | 6 ------ 2 files changed, 21 deletions(-) diff --git a/src/libutil/util.cc b/src/libutil/util.cc index 55d3e1d16..c2bceea3d 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -1140,21 +1140,6 @@ std::string toLower(const std::string & s) } -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/src/libutil/util.hh b/src/libutil/util.hh index 35909c8d5..7340ca6c7 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -349,12 +349,6 @@ bool hasSuffix(const string & s, const string & suffix); std::string toLower(const std::string & s); -/* 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();