summaryrefslogtreecommitdiffabout
path: root/html.c
authorMark Lodato <lodatom@gmail.com>2010-02-09 04:04:41 (UTC)
committer Mark Lodato <lodatom@gmail.com>2010-02-09 04:04:41 (UTC)
commit8aab27f24de70acfbdcee31c634a4b1facf23b92 (patch) (unidiff)
tree10e5f83a5f0c2a286ec2d1feecf6732f863c9a47 /html.c
parent547a64fbd65de293c290f4e18bbeae958d54aaa7 (diff)
downloadcgit-8aab27f24de70acfbdcee31c634a4b1facf23b92.zip
cgit-8aab27f24de70acfbdcee31c634a4b1facf23b92.tar.gz
cgit-8aab27f24de70acfbdcee31c634a4b1facf23b92.tar.bz2
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>
Diffstat (limited to 'html.c') (more/less context) (ignore whitespace changes)
-rw-r--r--html.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/html.c b/html.c
index 66ba65d..4033200 100644
--- a/html.c
+++ b/html.c
@@ -60,15 +60,15 @@ void html_status(int code, const char *msg, int more_headers)
60{ 60{
61 htmlf("Status: %d %s\n", code, msg); 61 htmlf("Status: %d %s\n", code, msg);
62 if (!more_headers) 62 if (!more_headers)
63 html("\n"); 63 html("\n");
64} 64}
65 65
66void html_txt(char *txt) 66void 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=='&') {
72 write(htmlfd, txt, t - txt); 72 write(htmlfd, txt, t - txt);
73 if (c=='>') 73 if (c=='>')
74 html("&gt;"); 74 html("&gt;");
@@ -81,15 +81,15 @@ void html_txt(char *txt)
81 t++; 81 t++;
82 } 82 }
83 if (t!=txt) 83 if (t!=txt)
84 html(txt); 84 html(txt);
85} 85}
86 86
87void html_ntxt(int len, char *txt) 87void 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=='&') {
93 write(htmlfd, txt, t - txt); 93 write(htmlfd, txt, t - txt);
94 if (c=='>') 94 if (c=='>')
95 html("&gt;"); 95 html("&gt;");
@@ -104,15 +104,15 @@ void html_ntxt(int len, char *txt)
104 if (t!=txt) 104 if (t!=txt)
105 write(htmlfd, txt, t - txt); 105 write(htmlfd, txt, t - txt);
106 if (len<0) 106 if (len<0)
107 html("..."); 107 html("...");
108} 108}
109 109
110void html_attr(char *txt) 110void 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=='\"') {
116 write(htmlfd, txt, t - txt); 116 write(htmlfd, txt, t - txt);
117 if (c=='>') 117 if (c=='>')
118 html("&gt;"); 118 html("&gt;");
@@ -127,15 +127,15 @@ void html_attr(char *txt)
127 t++; 127 t++;
128 } 128 }
129 if (t!=txt) 129 if (t!=txt)
130 html(txt); 130 html(txt);
131} 131}
132 132
133void html_url_path(char *txt) 133void 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=='?') {
139 write(htmlfd, txt, t - txt); 139 write(htmlfd, txt, t - txt);
140 write(htmlfd, fmt("%%%2x", c), 3); 140 write(htmlfd, fmt("%%%2x", c), 3);
141 txt = t+1; 141 txt = t+1;
@@ -143,15 +143,15 @@ void html_url_path(char *txt)
143 t++; 143 t++;
144 } 144 }
145 if (t!=txt) 145 if (t!=txt)
146 html(txt); 146 html(txt);
147} 147}
148 148
149void html_url_arg(char *txt) 149void 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=='?') {
155 write(htmlfd, txt, t - txt); 155 write(htmlfd, txt, t - txt);
156 write(htmlfd, fmt("%%%2x", c), 3); 156 write(htmlfd, fmt("%%%2x", c), 3);
157 txt = t+1; 157 txt = t+1;
@@ -159,34 +159,34 @@ void html_url_arg(char *txt)
159 t++; 159 t++;
160 } 160 }
161 if (t!=txt) 161 if (t!=txt)
162 html(txt); 162 html(txt);
163} 163}
164 164
165void html_hidden(char *name, char *value) 165void 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);
169 html("' value='"); 169 html("' value='");
170 html_attr(value); 170 html_attr(value);
171 html("'/>"); 171 html("'/>");
172} 172}
173 173
174void html_option(char *value, char *text, char *selected_value) 174void 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);
178 html("'"); 178 html("'");
179 if (selected_value && !strcmp(selected_value, value)) 179 if (selected_value && !strcmp(selected_value, value))
180 html(" selected='selected'"); 180 html(" selected='selected'");
181 html(">"); 181 html(">");
182 html_txt(text); 182 html_txt(text);
183 html("</option>\n"); 183 html("</option>\n");
184} 184}
185 185
186void html_link_open(char *url, char *title, char *class) 186void 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);
190 if (title) { 190 if (title) {
191 html("' title='"); 191 html("' title='");
192 html_attr(title); 192 html_attr(title);
@@ -254,20 +254,20 @@ char *convert_query_hexchar(char *txt)
254 *txt = d1 * 16 + d2; 254 *txt = d1 * 16 + d2;
255 strcpy(txt+1, txt+3); 255 strcpy(txt+1, txt+3);
256 return txt; 256 return txt;
257 } 257 }
258} 258}
259 259
260int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) 260int 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);
271 } 271 }
272 while((c=*t) != '\0') { 272 while((c=*t) != '\0') {
273 if (c=='=') { 273 if (c=='=') {