diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-12-04 08:00:31 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-12-04 08:00:31 -0600 |
| commit | 1d1aa3f1a1332c29b34ce48708f0341fb996034d (patch) | |
| tree | 93b8af1b54d894a17a56de872bc0709b0f80ca07 | |
| parent | ef02d8283560de301c6af1a586c480f1f139edb5 (diff) | |
| parent | 3af6c1b4bc9bf910fb27c01e5a28c2de0095fa22 (diff) | |
Merge "config: Speed up ACO & sorcery initialization" into 15
| -rw-r--r-- | main/config_options.c | 6 | ||||
| -rw-r--r-- | main/xml.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/config_options.c b/main/config_options.c index 3c0959ea3..a9a145b96 100644 --- a/main/config_options.c +++ b/main/config_options.c @@ -998,11 +998,11 @@ static int xmldoc_update_config_type(const char *module, const char *name, const /* If we already have a syntax element, bail. This isn't an error, since we may unload a module which * has updated the docs and then load it again. */ - if ((results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']/syntax", module, name))) { + if ((results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']/syntax", module, name))) { return 0; } - if (!(results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']", module, name))) { + if (!(results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']", module, name))) { ast_log(LOG_WARNING, "Cannot update type '%s' in module '%s' because it has no existing documentation!\n", name, module); return XMLDOC_STRICT ? -1 : 0; } @@ -1068,7 +1068,7 @@ static int xmldoc_update_config_option(struct aco_type **types, const char *modu return XMLDOC_STRICT ? -1 : 0; } - if (!(results = ast_xmldoc_query("//configInfo[@name='%s']/*/configObject[@name='%s']/configOption[@name='%s']", module, object_name, name))) { + if (!(results = ast_xmldoc_query("/docs/configInfo[@name='%s']/configFile/configObject[@name='%s']/configOption[@name='%s']", module, object_name, name))) { ast_log(LOG_WARNING, "Could not find option '%s' with type '%s' in module '%s'\n", name, object_name, module); return XMLDOC_STRICT ? -1 : 0; } diff --git a/main/xml.c b/main/xml.c index d32a8c5e4..d476c1d4f 100644 --- a/main/xml.c +++ b/main/xml.c @@ -96,6 +96,9 @@ struct ast_xml_doc *ast_xml_open(char *filename) ast_log(LOG_NOTICE, "XSLT support not found. XML documentation may be incomplete.\n"); #endif /* HAVE_LIBXSLT */ + /* Optimize for XPath */ + xmlXPathOrderDocElems(doc); + return (struct ast_xml_doc *) doc; } |