author | Mark Lodato <lodatom@gmail.com> | 2010-09-04 18:18:16 (UTC) |
---|---|---|
committer | Mark Lodato <lodatom@gmail.com> | 2010-09-04 18:30:10 (UTC) |
commit | d187b98557d91b874836f286b955ba76ab26fb02 (patch) (unidiff) | |
tree | b8cf6224768c70c69450a7f6643393e342786594 | |
parent | 25e8ba1996a7b5ea291c924b0990d706176f6fe6 (diff) | |
download | cgit-d187b98557d91b874836f286b955ba76ab26fb02.zip cgit-d187b98557d91b874836f286b955ba76ab26fb02.tar.gz cgit-d187b98557d91b874836f286b955ba76ab26fb02.tar.bz2 |
prefer html_raw() to write()
To make the code more consistent, and to not rely on the implementation
of html(), always use html_raw(...) instead of write(htmlfd, ...).
Signed-off-by: Mark Lodato <lodatom@gmail.com>
-rw-r--r-- | html.c | 18 | ||||
-rw-r--r-- | ui-blob.c | 4 | ||||
-rw-r--r-- | ui-tree.c | 2 |
3 files changed, 12 insertions, 12 deletions
@@ -97,3 +97,3 @@ void html_txt(const char *txt) | |||
97 | if (c=='<' || c=='>' || c=='&') { | 97 | if (c=='<' || c=='>' || c=='&') { |
98 | write(htmlfd, txt, t - txt); | 98 | html_raw(txt, t - txt); |
99 | if (c=='>') | 99 | if (c=='>') |
@@ -118,3 +118,3 @@ void html_ntxt(int len, const char *txt) | |||
118 | if (c=='<' || c=='>' || c=='&') { | 118 | if (c=='<' || c=='>' || c=='&') { |
119 | write(htmlfd, txt, t - txt); | 119 | html_raw(txt, t - txt); |
120 | if (c=='>') | 120 | if (c=='>') |
@@ -130,3 +130,3 @@ void html_ntxt(int len, const char *txt) | |||
130 | if (t!=txt) | 130 | if (t!=txt) |
131 | write(htmlfd, txt, t - txt); | 131 | html_raw(txt, t - txt); |
132 | if (len<0) | 132 | if (len<0) |
@@ -141,3 +141,3 @@ void html_attr(const char *txt) | |||
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
142 | write(htmlfd, txt, t - txt); | 142 | html_raw(txt, t - txt); |
143 | if (c=='>') | 143 | if (c=='>') |
@@ -165,4 +165,4 @@ void html_url_path(const char *txt) | |||
165 | if (e && c!='+' && c!='&' && c!='+') { | 165 | if (e && c!='+' && c!='&' && c!='+') { |
166 | write(htmlfd, txt, t - txt); | 166 | html_raw(txt, t - txt); |
167 | write(htmlfd, e, 3); | 167 | html_raw(e, 3); |
168 | txt = t+1; | 168 | txt = t+1; |
@@ -182,4 +182,4 @@ void html_url_arg(const char *txt) | |||
182 | if (e) { | 182 | if (e) { |
183 | write(htmlfd, txt, t - txt); | 183 | html_raw(txt, t - txt); |
184 | write(htmlfd, e, 3); | 184 | html_raw(e, 3); |
185 | txt = t+1; | 185 | txt = t+1; |
@@ -251,3 +251,3 @@ int html_include(const char *filename) | |||
251 | while((len = fread(buf, 1, 4096, f)) > 0) | 251 | while((len = fread(buf, 1, 4096, f)) > 0) |
252 | write(htmlfd, buf, len); | 252 | html_raw(buf, len); |
253 | fclose(f); | 253 | fclose(f); |
@@ -54,3 +54,3 @@ int cgit_print_file(char *path, const char *head) | |||
54 | buf[size] = '\0'; | 54 | buf[size] = '\0'; |
55 | write(htmlfd, buf, size); | 55 | html_raw(buf, size); |
56 | return 0; | 56 | return 0; |
@@ -110,3 +110,3 @@ void cgit_print_blob(const char *hex, char *path, const char *head) | |||
110 | cgit_print_http_headers(&ctx); | 110 | cgit_print_http_headers(&ctx); |
111 | write(htmlfd, buf, size); | 111 | html_raw(buf, size); |
112 | } | 112 | } |
@@ -48,3 +48,3 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) | |||
48 | cgit_open_filter(ctx.repo->source_filter); | 48 | cgit_open_filter(ctx.repo->source_filter); |
49 | write(STDOUT_FILENO, buf, size); | 49 | html_raw(buf, size); |
50 | cgit_close_filter(ctx.repo->source_filter); | 50 | cgit_close_filter(ctx.repo->source_filter); |