mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-14 19:10:49 +02:00
daemon: Remove unused XML output code.
* nix/local.mk (libutil_a_SOURCES): Remove libutil/xml-writer.cc. (libutil_headers): Remove libutil/xml-writer.hh. * nix/libutil/xml-writer.hh, nix/libutil/xml-writer.cc: Remove.
This commit is contained in:
parent
23aab4ab2c
commit
75abbd0cbe
3 changed files with 0 additions and 165 deletions
|
@ -1,94 +0,0 @@
|
||||||
#include <assert.h>
|
|
||||||
|
|
||||||
#include "xml-writer.hh"
|
|
||||||
|
|
||||||
|
|
||||||
namespace nix {
|
|
||||||
|
|
||||||
|
|
||||||
XMLWriter::XMLWriter(bool indent, std::ostream & output)
|
|
||||||
: output(output), indent(indent)
|
|
||||||
{
|
|
||||||
output << "<?xml version='1.0' encoding='utf-8'?>" << std::endl;
|
|
||||||
closed = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
XMLWriter::~XMLWriter()
|
|
||||||
{
|
|
||||||
close();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::close()
|
|
||||||
{
|
|
||||||
if (closed) return;
|
|
||||||
while (!pendingElems.empty()) closeElement();
|
|
||||||
closed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::indent_(unsigned int depth)
|
|
||||||
{
|
|
||||||
if (!indent) return;
|
|
||||||
output << string(depth * 2, ' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::openElement(const string & name,
|
|
||||||
const XMLAttrs & attrs)
|
|
||||||
{
|
|
||||||
assert(!closed);
|
|
||||||
indent_(pendingElems.size());
|
|
||||||
output << "<" << name;
|
|
||||||
writeAttrs(attrs);
|
|
||||||
output << ">";
|
|
||||||
if (indent) output << std::endl;
|
|
||||||
pendingElems.push_back(name);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::closeElement()
|
|
||||||
{
|
|
||||||
assert(!pendingElems.empty());
|
|
||||||
indent_(pendingElems.size() - 1);
|
|
||||||
output << "</" << pendingElems.back() << ">";
|
|
||||||
if (indent) output << std::endl;
|
|
||||||
pendingElems.pop_back();
|
|
||||||
if (pendingElems.empty()) closed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::writeEmptyElement(const string & name,
|
|
||||||
const XMLAttrs & attrs)
|
|
||||||
{
|
|
||||||
assert(!closed);
|
|
||||||
indent_(pendingElems.size());
|
|
||||||
output << "<" << name;
|
|
||||||
writeAttrs(attrs);
|
|
||||||
output << " />";
|
|
||||||
if (indent) output << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void XMLWriter::writeAttrs(const XMLAttrs & attrs)
|
|
||||||
{
|
|
||||||
for (XMLAttrs::const_iterator i = attrs.begin(); i != attrs.end(); ++i) {
|
|
||||||
output << " " << i->first << "=\"";
|
|
||||||
for (unsigned int j = 0; j < i->second.size(); ++j) {
|
|
||||||
char c = i->second[j];
|
|
||||||
if (c == '"') output << """;
|
|
||||||
else if (c == '<') output << "<";
|
|
||||||
else if (c == '>') output << ">";
|
|
||||||
else if (c == '&') output << "&";
|
|
||||||
/* Escape newlines to prevent attribute normalisation (see
|
|
||||||
XML spec, section 3.3.3. */
|
|
||||||
else if (c == '\n') output << "
";
|
|
||||||
else output << c;
|
|
||||||
}
|
|
||||||
output << "\"";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,69 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <string>
|
|
||||||
#include <list>
|
|
||||||
#include <map>
|
|
||||||
|
|
||||||
|
|
||||||
namespace nix {
|
|
||||||
|
|
||||||
using std::string;
|
|
||||||
using std::map;
|
|
||||||
using std::list;
|
|
||||||
|
|
||||||
|
|
||||||
typedef map<string, string> XMLAttrs;
|
|
||||||
|
|
||||||
|
|
||||||
class XMLWriter
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
|
|
||||||
std::ostream & output;
|
|
||||||
|
|
||||||
bool indent;
|
|
||||||
bool closed;
|
|
||||||
|
|
||||||
list<string> pendingElems;
|
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
XMLWriter(bool indent, std::ostream & output);
|
|
||||||
~XMLWriter();
|
|
||||||
|
|
||||||
void close();
|
|
||||||
|
|
||||||
void openElement(const string & name,
|
|
||||||
const XMLAttrs & attrs = XMLAttrs());
|
|
||||||
void closeElement();
|
|
||||||
|
|
||||||
void writeEmptyElement(const string & name,
|
|
||||||
const XMLAttrs & attrs = XMLAttrs());
|
|
||||||
|
|
||||||
private:
|
|
||||||
void writeAttrs(const XMLAttrs & attrs);
|
|
||||||
|
|
||||||
void indent_(unsigned int depth);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
class XMLOpenElement
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
XMLWriter & writer;
|
|
||||||
public:
|
|
||||||
XMLOpenElement(XMLWriter & writer, const string & name,
|
|
||||||
const XMLAttrs & attrs = XMLAttrs())
|
|
||||||
: writer(writer)
|
|
||||||
{
|
|
||||||
writer.openElement(name, attrs);
|
|
||||||
}
|
|
||||||
~XMLOpenElement()
|
|
||||||
{
|
|
||||||
writer.closeElement();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -55,7 +55,6 @@ libutil_a_SOURCES = \
|
||||||
%D%/libutil/affinity.cc \
|
%D%/libutil/affinity.cc \
|
||||||
%D%/libutil/serialise.cc \
|
%D%/libutil/serialise.cc \
|
||||||
%D%/libutil/util.cc \
|
%D%/libutil/util.cc \
|
||||||
%D%/libutil/xml-writer.cc \
|
|
||||||
%D%/libutil/hash.cc \
|
%D%/libutil/hash.cc \
|
||||||
%D%/libutil/gcrypt-hash.cc
|
%D%/libutil/gcrypt-hash.cc
|
||||||
|
|
||||||
|
@ -63,7 +62,6 @@ libutil_headers = \
|
||||||
%D%/libutil/affinity.hh \
|
%D%/libutil/affinity.hh \
|
||||||
%D%/libutil/hash.hh \
|
%D%/libutil/hash.hh \
|
||||||
%D%/libutil/serialise.hh \
|
%D%/libutil/serialise.hh \
|
||||||
%D%/libutil/xml-writer.hh \
|
|
||||||
%D%/libutil/util.hh \
|
%D%/libutil/util.hh \
|
||||||
%D%/libutil/archive.hh \
|
%D%/libutil/archive.hh \
|
||||||
%D%/libutil/types.hh \
|
%D%/libutil/types.hh \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue