~ruther/guix-local

ed464f48efd80e6439441d7a9f6d0e7988fb1272 — Andy Wingo 8 years ago 842e0e4
nix: Remove unused function.

* nix/libutil/util.hh:
* nix/libutil/util.cc (decodeOctalEscaped): Remove unused and buggy function.
2 files changed, 0 insertions(+), 21 deletions(-)

M nix/libutil/util.cc
M nix/libutil/util.hh
M nix/libutil/util.cc => nix/libutil/util.cc +0 -15
@@ 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 {

M nix/libutil/util.hh => nix/libutil/util.hh +0 -6
@@ 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();