aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Cleanup: some style corrections.

Browse Source
This commit is contained in:
Philipp Schafft 2015-03-01 15:52:37 +00:00
parent e0c05ef8a9
commit e870c21384
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xslt.c
View File

@ -202,21 +202,24 @@ static xmlDocPtr custom_loader(const xmlChar *URI,
void *ctxt, void *ctxt,
xsltLoadType type) xsltLoadType type)
{ {
int len;
xmlDocPtr ret; xmlDocPtr ret;
xmlChar *rel_path, *fn, *final_URI = NULL; xmlChar *rel_path, *fn, *final_URI = NULL;
xsltStylesheet *c; xsltStylesheet *c;
ice_config_t *conf; ice_config_t *config;
switch (type) { switch (type) {
/* In case an include is loaded */ /* In case an include is loaded */
case XSLT_LOAD_STYLESHEET: case XSLT_LOAD_STYLESHEET:
/* Not look in admindir if the include file exists */ /* Not look in admindir if the include file exists */
if (access((char *)URI, F_OK) == 0) if (access((const char *)URI, F_OK) == 0)
break; break;
c = (xsltStylesheet *) ctxt; c = (xsltStylesheet *) ctxt;
/* Check if we actually have context/path */ /* Check if we actually have context/path */
if (ctxt == NULL || c->doc->URL == NULL) if (ctxt == NULL || c->doc->URL == NULL)
break; break;
/* Construct the right path */ /* Construct the right path */
rel_path = xmlBuildRelativeURI(URI, c->doc->URL); rel_path = xmlBuildRelativeURI(URI, c->doc->URL);
if (rel_path != NULL && admin_path != NULL) { if (rel_path != NULL && admin_path != NULL) {
@ -224,6 +227,7 @@ static xmlDocPtr custom_loader(const xmlChar *URI,
final_URI = fn; final_URI = fn;
xmlFree(rel_path); xmlFree(rel_path);
} }
/* Fail if there was an error constructing the path */ /* Fail if there was an error constructing the path */
if (final_URI == NULL) { if (final_URI == NULL) {
if (rel_path) if (rel_path)
@ -233,25 +237,32 @@ static xmlDocPtr custom_loader(const xmlChar *URI,
break; break;
/* In case a top stylesheet is loaded */ /* In case a top stylesheet is loaded */
case XSLT_LOAD_START: case XSLT_LOAD_START:
conf = config_get_config(); config = config_get_config();
len = strlen(conf->adminroot_dir); /* Check if admin path actually changed. If so clear it. */
if (admin_path != NULL && if (admin_path != NULL &&
strncmp(conf->adminroot_dir, (char *)admin_path, len) != 0) { strcmp(config->adminroot_dir, (char *)admin_path) != 0) {
xmlFree(admin_path); xmlFree(admin_path);
admin_path = NULL; admin_path = NULL;
} }
if (admin_path == NULL) { /* Do we need to load the admin path? */
if (!admin_path) {
size_t len = strlen(config->adminroot_dir);
admin_path = xmlMemMalloc(len+2); admin_path = xmlMemMalloc(len+2);
if (admin_path == NULL) if (!admin_path)
return NULL; return NULL;
xmlStrPrintf(admin_path, len+2, XMLSTR("%s/"), XMLSTR(conf->adminroot_dir));
/* Copy over admin path and add a tailing slash. */
xmlStrPrintf(admin_path, len+2, XMLSTR("%s/"), XMLSTR(config->adminroot_dir));
} }
config_release_config(); config_release_config();
break; break;
/* Avoid warnings about other events we don't care for */
default: default:
break; break;
} }
/* Get the actual xmlDoc */ /* Get the actual xmlDoc */
if (final_URI) { if (final_URI) {
ret = xslt_loader(final_URI, dict, options, ctxt, type); ret = xslt_loader(final_URI, dict, options, ctxt, type);