diff options
author | Taybin Rutkin <taybin@taybin.com> | 2006-07-19 03:49:52 +0000 |
---|---|---|
committer | Taybin Rutkin <taybin@taybin.com> | 2006-07-19 03:49:52 +0000 |
commit | 50a4504e488227182374b39c7ea50a1147f3557d (patch) | |
tree | 48068cedd3068773fb9fb651df9eaf843dffefa7 /libs | |
parent | edde9b59833183904ec7bd7fd49bb2bc8515f7e9 (diff) |
Updated config.guess file
Added mac specific ardour2_mac_ui.rc file
Fixed some memory leaks in add_instant_xml() usage.
Added EXTRA_WARN scons option for pedants.
Reformatted xml++.cc into something that wouldn't drive me insane.
git-svn-id: svn://localhost/ardour2/trunk@686 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/audio_library.cc | 3 | ||||
-rw-r--r-- | libs/pbd/stateful.cc | 2 | ||||
-rw-r--r-- | libs/pbd/xml++.cc | 411 |
3 files changed, 214 insertions, 202 deletions
diff --git a/libs/ardour/audio_library.cc b/libs/ardour/audio_library.cc index 168a1dcf5d..1358ebd6d9 100644 --- a/libs/ardour/audio_library.cc +++ b/libs/ardour/audio_library.cc @@ -84,7 +84,6 @@ AudioLibrary::AudioLibrary () AudioLibrary::~AudioLibrary () { - add_instant_xml(get_state(), get_user_ardour_path()); } void @@ -361,6 +360,8 @@ void AudioLibrary::set_paths (vector<string> paths) { sfdb_paths = paths; + + add_instant_xml(get_state(), get_user_ardour_path()); } vector<string> diff --git a/libs/pbd/stateful.cc b/libs/pbd/stateful.cc index 16aa528f59..f0f820fe9d 100644 --- a/libs/pbd/stateful.cc +++ b/libs/pbd/stateful.cc @@ -82,7 +82,7 @@ Stateful::add_instant_xml (XMLNode& node, const string& dir) } _instant_xml->remove_nodes_and_delete (node.name()); - _instant_xml->add_child_copy (node); + _instant_xml->add_child_nocopy (node); XMLTree tree; tree.set_filename(dir+"/instant.xml"); diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc index e496d8b2fd..dec5c346cc 100644 --- a/libs/pbd/xml++.cc +++ b/libs/pbd/xml++.cc @@ -29,100 +29,101 @@ XMLTree::XMLTree(const string &fn) XMLTree::XMLTree(const XMLTree * from) { - _filename = from->filename(); - _root = new XMLNode(*from->root()); - _compression = from->compression(); - _initialized = true; + _filename = from->filename(); + _root = new XMLNode(*from->root()); + _compression = from->compression(); + _initialized = true; } XMLTree::~XMLTree() { - if (_initialized && _root) + if (_initialized && _root) delete _root; } int XMLTree::set_compression(int c) { - if (c > 9) - c = 9; - - if (c < 0) - c = 0; - - _compression = c; - - return _compression; + if (c > 9) { + c = 9; + } else if (c < 0) { + c = 0; + } + + _compression = c; + + return _compression; } bool XMLTree::read(void) { - xmlDocPtr doc; - - if (_root) { + xmlDocPtr doc; + + if (_root) { delete _root; _root = 0; - } - - xmlKeepBlanksDefault(0); - - doc = xmlParseFile(_filename.c_str()); - if (!doc) { - _initialized = false; - return false; - } - - _root = readnode(xmlDocGetRootElement(doc)); - xmlFreeDoc(doc); - _initialized = true; - - return true; + } + + xmlKeepBlanksDefault(0); + + doc = xmlParseFile(_filename.c_str()); + if (!doc) { + _initialized = false; + return false; + } + + _root = readnode(xmlDocGetRootElement(doc)); + xmlFreeDoc(doc); + _initialized = true; + + return true; } bool XMLTree::read_buffer(const string & buffer) { - xmlDocPtr doc; - - _filename = ""; - - if (_root) { + xmlDocPtr doc; + + _filename = ""; + + if (_root) { delete _root; _root = 0; - } - - doc = xmlParseMemory((char *) buffer.c_str(), buffer.length()); - if (!doc) { + } + + doc = xmlParseMemory((char *) buffer.c_str(), buffer.length()); + if (!doc) { _initialized = false; return false; - } - - _root = readnode(xmlDocGetRootElement(doc)); - xmlFreeDoc(doc); - _initialized = true; - - return true; + } + + _root = readnode(xmlDocGetRootElement(doc)); + xmlFreeDoc(doc); + _initialized = true; + + return true; } bool XMLTree::write(void) const { - xmlDocPtr doc; - XMLNodeList children; - int result; - - xmlKeepBlanksDefault(0); - doc = xmlNewDoc((xmlChar *) "1.0"); - xmlSetDocCompressMode(doc, _compression); - writenode(doc, _root, doc->children, 1); - result = xmlSaveFormatFile(_filename.c_str(), doc, 1); - xmlFreeDoc(doc); - - if (result == -1) + xmlDocPtr doc; + XMLNodeList children; + int result; + + xmlKeepBlanksDefault(0); + doc = xmlNewDoc((xmlChar *) "1.0"); + xmlSetDocCompressMode(doc, _compression); + writenode(doc, _root, doc->children, 1); + result = xmlSaveFormatFile(_filename.c_str(), doc, 1); + xmlFreeDoc(doc); + + if (result == -1) { return false; - - return true; + } + + return true; } void @@ -142,105 +143,111 @@ XMLTree::debug(FILE* out) const const string & XMLTree::write_buffer(void) const { - static string retval; - char *ptr; - int len; - xmlDocPtr doc; - XMLNodeList children; - - xmlKeepBlanksDefault(0); - doc = xmlNewDoc((xmlChar *) "1.0"); - xmlSetDocCompressMode(doc, _compression); - writenode(doc, _root, doc->children, 1); - xmlDocDumpMemory(doc, (xmlChar **) & ptr, &len); - xmlFreeDoc(doc); - - retval = ptr; - - free(ptr); - - return retval; + static string retval; + char *ptr; + int len; + xmlDocPtr doc; + XMLNodeList children; + + xmlKeepBlanksDefault(0); + doc = xmlNewDoc((xmlChar *) "1.0"); + xmlSetDocCompressMode(doc, _compression); + writenode(doc, _root, doc->children, 1); + xmlDocDumpMemory(doc, (xmlChar **) & ptr, &len); + xmlFreeDoc(doc); + + retval = ptr; + + free(ptr); + + return retval; } XMLNode::XMLNode(const string & n) : _name(n), _is_content(false), _content(string()) { - - if (_name.empty()) + if (_name.empty()) { _initialized = false; - else + } else { _initialized = true; + } } XMLNode::XMLNode(const string & n, const string & c) - :_name(string()), _is_content(true), _content(c) + :_name(n), _is_content(true), _content(c) { - _initialized = true; + _initialized = true; } XMLNode::XMLNode(const XMLNode& from) : _initialized(false) { - XMLPropertyList props; - XMLPropertyIterator curprop; - XMLNodeList nodes; - XMLNodeIterator curnode; - - _name = from.name(); - set_content(from.content()); - - props = from.properties(); - for (curprop = props.begin(); curprop != props.end(); curprop++) - add_property((*curprop)->name().c_str(), (*curprop)->value()); - - nodes = from.children(); - for (curnode = nodes.begin(); curnode != nodes.end(); curnode++) + XMLPropertyList props; + XMLPropertyIterator curprop; + XMLNodeList nodes; + XMLNodeIterator curnode; + + _name = from.name(); + set_content(from.content()); + + props = from.properties(); + for (curprop = props.begin(); curprop != props.end(); ++curprop) { + add_property((*curprop)->name().c_str(), (*curprop)->value()); + } + + nodes = from.children(); + for (curnode = nodes.begin(); curnode != nodes.end(); ++curnode) { add_child_copy(**curnode); + } } XMLNode::~XMLNode() { - XMLNodeIterator curchild; - XMLPropertyIterator curprop; - - for (curchild = _children.begin(); curchild != _children.end(); - curchild++) + XMLNodeIterator curchild; + XMLPropertyIterator curprop; + + for (curchild = _children.begin(); curchild != _children.end(); ++curchild) { delete *curchild; - - for (curprop = _proplist.begin(); curprop != _proplist.end(); - curprop++) + } + + for (curprop = _proplist.begin(); curprop != _proplist.end(); ++curprop) { delete *curprop; + } } const string & XMLNode::set_content(const string & c) { - if (c.empty()) + if (c.empty()) { _is_content = false; - else + } else { _is_content = true; - - _content = c; - - return _content; + } + + _content = c; + + return _content; } const XMLNodeList & XMLNode::children(const string & n) const { - static XMLNodeList retval; - XMLNodeConstIterator cur; - - if (n.length() == 0) + static XMLNodeList retval; + XMLNodeConstIterator cur; + + if (n.length() == 0) { return _children; - - retval.erase(retval.begin(), retval.end()); - - for (cur = _children.begin(); cur != _children.end(); cur++) - if ((*cur)->name() == n) - retval.insert(retval.end(), *cur); - - return retval; + } + + retval.erase(retval.begin(), retval.end()); + + for (cur = _children.begin(); cur != _children.end(); ++cur) { + if ((*cur)->name() == n) { + retval.insert(retval.end(), *cur); + } + } + + return retval; } XMLNode * @@ -273,8 +280,10 @@ XMLProperty * XMLNode::property(const char * n) { string ns(n); - if (_propmap.find(ns) == _propmap.end()) + if (_propmap.find(ns) == _propmap.end()) { return 0; + } + return _propmap[ns]; } @@ -288,8 +297,9 @@ XMLNode::add_property(const char * n, const string & v) XMLProperty *tmp = new XMLProperty(ns, v); - if (!tmp) + if (!tmp) { return 0; + } _propmap[tmp->name()] = tmp; _proplist.insert(_proplist.end(), tmp); @@ -307,43 +317,43 @@ XMLNode::add_property(const char * n, const char * v) void XMLNode::remove_property(const string & n) { - if (_propmap.find(n) != _propmap.end()) { + if (_propmap.find(n) != _propmap.end()) { _proplist.remove(_propmap[n]); _propmap.erase(n); - } + } } void XMLNode::remove_nodes(const string & n) { - XMLNodeIterator i = _children.begin(); - XMLNodeIterator tmp; - - while (i != _children.end()) { - tmp = i; - ++tmp; - if ((*i)->name() == n) { - _children.erase (i); - } - i = tmp; - } + XMLNodeIterator i = _children.begin(); + XMLNodeIterator tmp; + + while (i != _children.end()) { + tmp = i; + ++tmp; + if ((*i)->name() == n) { + _children.erase (i); + } + i = tmp; + } } void XMLNode::remove_nodes_and_delete(const string & n) { - XMLNodeIterator i = _children.begin(); - XMLNodeIterator tmp; - - while (i != _children.end()) { - tmp = i; - ++tmp; - if ((*i)->name() == n) { - delete *i; - _children.erase (i); - } - i = tmp; - } + XMLNodeIterator i = _children.begin(); + XMLNodeIterator tmp; + + while (i != _children.end()) { + tmp = i; + ++tmp; + if ((*i)->name() == n) { + delete *i; + _children.erase (i); + } + i = tmp; + } } XMLProperty::XMLProperty(const string &n, const string &v) @@ -359,64 +369,65 @@ XMLProperty::~XMLProperty() static XMLNode * readnode(xmlNodePtr node) { - string name, content; - xmlNodePtr child; - XMLNode *tmp; - xmlAttrPtr attr; - - if (node->name) + string name, content; + xmlNodePtr child; + XMLNode *tmp; + xmlAttrPtr attr; + + if (node->name) { name = (char *) node->name; - - tmp = new XMLNode(name); - - for (attr = node->properties; attr; attr = attr->next) { + } + + tmp = new XMLNode(name); + + for (attr = node->properties; attr; attr = attr->next) { content = ""; - if (attr->children) - content = (char *) attr->children->content; + if (attr->children) { + content = (char *) attr->children->content; + } tmp->add_property((char *) attr->name, content); - } - - if (node->content) + } + + if (node->content) { tmp->set_content((char *) node->content); - else + } else { tmp->set_content(string()); - - for (child = node->children; child; child = child->next) - tmp->add_child_nocopy (*readnode(child)); - - return tmp; + } + + for (child = node->children; child; child = child->next) { + tmp->add_child_nocopy (*readnode(child)); + } + + return tmp; } static void -writenode(xmlDocPtr doc, XMLNode * n, xmlNodePtr p, int root = - 0) +writenode(xmlDocPtr doc, XMLNode * n, xmlNodePtr p, int root = 0) { - XMLPropertyList props; - XMLPropertyIterator curprop; - XMLNodeList children; - XMLNodeIterator curchild; - xmlNodePtr node; - - if (root) - node = doc->children = - xmlNewDocNode(doc, 0, (xmlChar *) n->name().c_str(), 0); - - else + XMLPropertyList props; + XMLPropertyIterator curprop; + XMLNodeList children; + XMLNodeIterator curchild; + xmlNodePtr node; + + if (root) { + node = doc->children = xmlNewDocNode(doc, 0, (xmlChar *) n->name().c_str(), 0); + } else { node = xmlNewChild(p, 0, (xmlChar *) n->name().c_str(), 0); - - if (n->is_content()) { + } + + if (n->is_content()) { node->type = XML_TEXT_NODE; - xmlNodeSetContentLen(node, (const xmlChar *) n->content().c_str(), - n->content().length()); - } - - props = n->properties(); - for (curprop = props.begin(); curprop != props.end(); curprop++) - xmlSetProp(node, (xmlChar *) (*curprop)->name().c_str(), - (xmlChar *) (*curprop)->value().c_str()); - - children = n->children(); - for (curchild = children.begin(); curchild != children.end(); - curchild++) + xmlNodeSetContentLen(node, (const xmlChar *) n->content().c_str(), n->content().length()); + } + + props = n->properties(); + for (curprop = props.begin(); curprop != props.end(); ++curprop) { + xmlSetProp(node, (xmlChar *) (*curprop)->name().c_str(), (xmlChar *) (*curprop)->value().c_str()); + } + + children = n->children(); + for (curchild = children.begin(); curchild != children.end(); ++curchild) { writenode(doc, *curchild, node); + } } |