aboutsummaryrefslogtreecommitdiff
path: root/src/libutil
diff options
context:
space:
mode:
Diffstat (limited to 'src/libutil')
-rw-r--r--src/libutil/util.cc41
-rw-r--r--src/libutil/util.hh14
2 files changed, 0 insertions, 55 deletions
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index f1e714a66..7efaf3e89 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1087,47 +1087,6 @@ bool hasSuffix(const string & s, const string & suffix)
}
-void expect(std::istream & str, const string & s)
-{
- char s2[s.size()];
- str.read(s2, s.size());
- if (string(s2, s.size()) != s)
- throw FormatError(format("expected string ‘%1%’") % s);
-}
-
-
-string parseString(std::istream & str)
-{
- string res;
- expect(str, "\"");
- int c;
- while ((c = str.get()) != '"')
- if (c == '\\') {
- c = str.get();
- if (c == 'n') res += '\n';
- else if (c == 'r') res += '\r';
- else if (c == 't') res += '\t';
- else res += c;
- }
- else res += c;
- return res;
-}
-
-
-bool endOfList(std::istream & str)
-{
- if (str.peek() == ',') {
- str.get();
- return false;
- }
- if (str.peek() == ']') {
- str.get();
- return true;
- }
- return false;
-}
-
-
string decodeOctalEscaped(const string & s)
{
string r;
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 819921dff..69c723ad2 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -334,20 +334,6 @@ bool hasPrefix(const string & s, const string & prefix);
bool hasSuffix(const string & s, const string & suffix);
-/* Read string `s' from stream `str'. */
-void expect(std::istream & str, const string & s);
-
-MakeError(FormatError, Error)
-
-
-/* Read a C-style string from stream `str'. */
-string parseString(std::istream & str);
-
-
-/* Utility function used to parse legacy ATerms. */
-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"). */