Commit 1a426f7f authored by Philipp Schafft's avatar Philipp Schafft 🦁

Cleanup: Renamed *_TRANSFORMED* to *_HTML*

parent c7910fb8
Pipeline #236 passed with stage
in 45 seconds
This diff is collapsed.
...@@ -252,8 +252,8 @@ static inline void _client_send_error(client_t *client, const icecast_error_t *e ...@@ -252,8 +252,8 @@ static inline void _client_send_error(client_t *client, const icecast_error_t *e
case ADMIN_FORMAT_RAW: case ADMIN_FORMAT_RAW:
xslt = NULL; xslt = NULL;
break; break;
case ADMIN_FORMAT_TRANSFORMED: case ADMIN_FORMAT_HTML:
xslt = CLIENT_DEFAULT_ERROR_XSL_TRANSFORMED; xslt = CLIENT_DEFAULT_ERROR_XSL_HTML;
break; break;
case ADMIN_FORMAT_PLAINTEXT: case ADMIN_FORMAT_PLAINTEXT:
xslt = CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT; xslt = CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT;
...@@ -435,8 +435,8 @@ void client_send_reportxml(client_t *client, reportxml_t *report, document_domai ...@@ -435,8 +435,8 @@ void client_send_reportxml(client_t *client, reportxml_t *report, document_domai
case ADMIN_FORMAT_RAW: case ADMIN_FORMAT_RAW:
/* noop, we don't need to set xsl */ /* noop, we don't need to set xsl */
break; break;
case ADMIN_FORMAT_TRANSFORMED: case ADMIN_FORMAT_HTML:
xsl = CLIENT_DEFAULT_REPORT_XSL_TRANSFORMED; xsl = CLIENT_DEFAULT_REPORT_XSL_HTML;
break; break;
case ADMIN_FORMAT_PLAINTEXT: case ADMIN_FORMAT_PLAINTEXT:
xsl = CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT; xsl = CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT;
...@@ -563,7 +563,7 @@ admin_format_t client_get_admin_format_by_content_negotiation(client_t *client) ...@@ -563,7 +563,7 @@ admin_format_t client_get_admin_format_by_content_negotiation(client_t *client)
if (strcmp(pref, "text/xml") == 0) { if (strcmp(pref, "text/xml") == 0) {
return ADMIN_FORMAT_RAW; return ADMIN_FORMAT_RAW;
} else if (strcmp(pref, "text/html") == 0) { } else if (strcmp(pref, "text/html") == 0) {
return ADMIN_FORMAT_TRANSFORMED; return ADMIN_FORMAT_HTML;
} else if (strcmp(pref, "text/plain") == 0) { } else if (strcmp(pref, "text/plain") == 0) {
return ADMIN_FORMAT_PLAINTEXT; return ADMIN_FORMAT_PLAINTEXT;
} else { } else {
......
...@@ -27,11 +27,11 @@ ...@@ -27,11 +27,11 @@
#include "refbuf.h" #include "refbuf.h"
#include "module.h" #include "module.h"
#define CLIENT_DEFAULT_REPORT_XSL_TRANSFORMED "report-html.xsl" #define CLIENT_DEFAULT_REPORT_XSL_HTML "report-html.xsl"
#define CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT "report-plaintext.xsl" #define CLIENT_DEFAULT_REPORT_XSL_PLAINTEXT "report-plaintext.xsl"
#define CLIENT_DEFAULT_ERROR_XSL_TRANSFORMED "error-html.xsl" #define CLIENT_DEFAULT_ERROR_XSL_HTML "error-html.xsl"
#define CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT "error-plaintext.xsl" #define CLIENT_DEFAULT_ERROR_XSL_PLAINTEXT "error-plaintext.xsl"
#define CLIENT_DEFAULT_ADMIN_FORMAT ADMIN_FORMAT_TRANSFORMED #define CLIENT_DEFAULT_ADMIN_FORMAT ADMIN_FORMAT_HTML
typedef enum _document_domain_tag { typedef enum _document_domain_tag {
DOCUMENT_DOMAIN_WEB, DOCUMENT_DOMAIN_WEB,
......
...@@ -506,7 +506,7 @@ int fserve_client_create (client_t *httpclient, const char *path) ...@@ -506,7 +506,7 @@ int fserve_client_create (client_t *httpclient, const char *path)
*eol = '\0'; *eol = '\0';
doc = stats_get_xml (0, reference, httpclient->mode); doc = stats_get_xml (0, reference, httpclient->mode);
free (reference); free (reference);
admin_send_response (doc, httpclient, ADMIN_FORMAT_TRANSFORMED, xslt_playlist_requested); admin_send_response (doc, httpclient, ADMIN_FORMAT_HTML, xslt_playlist_requested);
xmlFreeDoc(doc); xmlFreeDoc(doc);
free (fullpath); free (fullpath);
return 0; return 0;
......
...@@ -32,7 +32,7 @@ typedef int32_t admin_command_id_t; ...@@ -32,7 +32,7 @@ typedef int32_t admin_command_id_t;
typedef enum { typedef enum {
ADMIN_FORMAT_AUTO, ADMIN_FORMAT_AUTO,
ADMIN_FORMAT_RAW, ADMIN_FORMAT_RAW,
ADMIN_FORMAT_TRANSFORMED, ADMIN_FORMAT_HTML,
ADMIN_FORMAT_PLAINTEXT ADMIN_FORMAT_PLAINTEXT
} admin_format_t; } admin_format_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment