diff options
author | Mark Lodato <lodatom@gmail.com> | 2010-02-09 13:04:41 (JST) |
---|---|---|
committer | Mark Lodato <lodatom@gmail.com> | 2010-02-09 13:04:41 (JST) |
commit | 8aab27f24de70acfbdcee31c634a4b1facf23b92 (patch) | |
tree | 10e5f83a5f0c2a286ec2d1feecf6732f863c9a47 | |
parent | 547a64fbd65de293c290f4e18bbeae958d54aaa7 (diff) | |
download | cgit-8aab27f24de70acfbdcee31c634a4b1facf23b92.zip cgit-8aab27f24de70acfbdcee31c634a4b1facf23b92.tar.gz |
html: make all strings 'const char *'
None of the html_* functions modify their argument, so they can all be
'const char *' instead of a simple 'char *'. This removes the need to
cast (or copy) when trying to print a const string.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
-rw-r--r-- | html.c | 34 | ||||
-rw-r--r-- | html.h | 18 |
2 files changed, 26 insertions, 26 deletions
@@ -63,9 +63,9 @@ void html_status(int code, const char *msg, int more_headers) | |||
63 | html("\n"); | 63 | html("\n"); |
64 | } | 64 | } |
65 | 65 | ||
66 | void html_txt(char *txt) | 66 | void html_txt(const char *txt) |
67 | { | 67 | { |
68 | char *t = txt; | 68 | const char *t = txt; |
69 | while(t && *t){ | 69 | while(t && *t){ |
70 | int c = *t; | 70 | int c = *t; |
71 | if (c=='<' || c=='>' || c=='&') { | 71 | if (c=='<' || c=='>' || c=='&') { |
@@ -84,9 +84,9 @@ void html_txt(char *txt) | |||
84 | html(txt); | 84 | html(txt); |
85 | } | 85 | } |
86 | 86 | ||
87 | void html_ntxt(int len, char *txt) | 87 | void html_ntxt(int len, const char *txt) |
88 | { | 88 | { |
89 | char *t = txt; | 89 | const char *t = txt; |
90 | while(t && *t && len--){ | 90 | while(t && *t && len--){ |
91 | int c = *t; | 91 | int c = *t; |
92 | if (c=='<' || c=='>' || c=='&') { | 92 | if (c=='<' || c=='>' || c=='&') { |
@@ -107,9 +107,9 @@ void html_ntxt(int len, char *txt) | |||
107 | html("..."); | 107 | html("..."); |
108 | } | 108 | } |
109 | 109 | ||
110 | void html_attr(char *txt) | 110 | void html_attr(const char *txt) |
111 | { | 111 | { |
112 | char *t = txt; | 112 | const char *t = txt; |
113 | while(t && *t){ | 113 | while(t && *t){ |
114 | int c = *t; | 114 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
@@ -130,9 +130,9 @@ void html_attr(char *txt) | |||
130 | html(txt); | 130 | html(txt); |
131 | } | 131 | } |
132 | 132 | ||
133 | void html_url_path(char *txt) | 133 | void html_url_path(const char *txt) |
134 | { | 134 | { |
135 | char *t = txt; | 135 | const char *t = txt; |
136 | while(t && *t){ | 136 | while(t && *t){ |
137 | int c = *t; | 137 | int c = *t; |
138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { | 138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
@@ -146,9 +146,9 @@ void html_url_path(char *txt) | |||
146 | html(txt); | 146 | html(txt); |
147 | } | 147 | } |
148 | 148 | ||
149 | void html_url_arg(char *txt) | 149 | void html_url_arg(const char *txt) |
150 | { | 150 | { |
151 | char *t = txt; | 151 | const char *t = txt; |
152 | while(t && *t){ | 152 | while(t && *t){ |
153 | int c = *t; | 153 | int c = *t; |
154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { | 154 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { |
@@ -162,7 +162,7 @@ void html_url_arg(char *txt) | |||
162 | html(txt); | 162 | html(txt); |
163 | } | 163 | } |
164 | 164 | ||
165 | void html_hidden(char *name, char *value) | 165 | void html_hidden(const char *name, const char *value) |
166 | { | 166 | { |
167 | html("<input type='hidden' name='"); | 167 | html("<input type='hidden' name='"); |
168 | html_attr(name); | 168 | html_attr(name); |
@@ -171,7 +171,7 @@ void html_hidden(char *name, char *value) | |||
171 | html("'/>"); | 171 | html("'/>"); |
172 | } | 172 | } |
173 | 173 | ||
174 | void html_option(char *value, char *text, char *selected_value) | 174 | void html_option(const char *value, const char *text, const char *selected_value) |
175 | { | 175 | { |
176 | html("<option value='"); | 176 | html("<option value='"); |
177 | html_attr(value); | 177 | html_attr(value); |
@@ -183,7 +183,7 @@ void html_option(char *value, char *text, char *selected_value) | |||
183 | html("</option>\n"); | 183 | html("</option>\n"); |
184 | } | 184 | } |
185 | 185 | ||
186 | void html_link_open(char *url, char *title, char *class) | 186 | void html_link_open(const char *url, const char *title, const char *class) |
187 | { | 187 | { |
188 | html("<a href='"); | 188 | html("<a href='"); |
189 | html_attr(url); | 189 | html_attr(url); |
@@ -257,14 +257,14 @@ char *convert_query_hexchar(char *txt) | |||
257 | } | 257 | } |
258 | } | 258 | } |
259 | 259 | ||
260 | int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) | 260 | int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) |
261 | { | 261 | { |
262 | char *t, *value = NULL, c; | 262 | char *t, *txt, *value = NULL, c; |
263 | 263 | ||
264 | if (!txt) | 264 | if (!txt_) |
265 | return 0; | 265 | return 0; |
266 | 266 | ||
267 | t = txt = strdup(txt); | 267 | t = txt = strdup(txt_); |
268 | if (t == NULL) { | 268 | if (t == NULL) { |
269 | printf("Out of memory\n"); | 269 | printf("Out of memory\n"); |
270 | exit(1); | 270 | exit(1); |
@@ -7,18 +7,18 @@ extern void html_raw(const char *txt, size_t size); | |||
7 | extern void html(const char *txt); | 7 | extern void html(const char *txt); |
8 | extern void htmlf(const char *format,...); | 8 | extern void htmlf(const char *format,...); |
9 | extern void html_status(int code, const char *msg, int more_headers); | 9 | extern void html_status(int code, const char *msg, int more_headers); |
10 | extern void html_txt(char *txt); | 10 | extern void html_txt(const char *txt); |
11 | extern void html_ntxt(int len, char *txt); | 11 | extern void html_ntxt(int len, const char *txt); |
12 | extern void html_attr(char *txt); | 12 | extern void html_attr(const char *txt); |
13 | extern void html_url_path(char *txt); | 13 | extern void html_url_path(const char *txt); |
14 | extern void html_url_arg(char *txt); | 14 | extern void html_url_arg(const char *txt); |
15 | extern void html_hidden(char *name, char *value); | 15 | extern void html_hidden(const char *name, const char *value); |
16 | extern void html_option(char *value, char *text, char *selected_value); | 16 | extern void html_option(const char *value, const char *text, const char *selected_value); |
17 | extern void html_link_open(char *url, char *title, char *class); | 17 | extern void html_link_open(const char *url, const char *title, const char *class); |
18 | extern void html_link_close(void); | 18 | extern void html_link_close(void); |
19 | extern void html_fileperm(unsigned short mode); | 19 | extern void html_fileperm(unsigned short mode); |
20 | extern int html_include(const char *filename); | 20 | extern int html_include(const char *filename); |
21 | 21 | ||
22 | extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); | 22 | extern int http_parse_querystring(const char *txt, void (*fn)(const char *name, const char *value)); |
23 | 23 | ||
24 | #endif /* HTML_H */ | 24 | #endif /* HTML_H */ |