diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-26 15:34:29 +0200 |
commit | 4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch) | |
tree | 17bac0c3211a872d3a0292cae20347718ecdd5f7 /nix/libutil/util.hh | |
parent | 9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff) | |
parent | 72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff) | |
download | patches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar patches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'nix/libutil/util.hh')
-rw-r--r-- | nix/libutil/util.hh | 6 |
1 files changed, 0 insertions, 6 deletions
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(); |