aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar John Keeping <john@keeping.me.uk>2013-04-07 20:46:45 (JST)
committerGravatar Jason A. Donenfeld <Jason@zx2c4.com>2013-04-08 22:59:51 (JST)
commit57d09bf448990b3a67436e928807e854e491756f (patch)
treef98b55d814936d416c42f9ca14067934c6e280bc
parentb1f17f168b91d709c0c0e62608de301a36f06da9 (diff)
downloadcgit-57d09bf448990b3a67436e928807e854e491756f.zip
cgit-57d09bf448990b3a67436e928807e854e491756f.tar.gz
Mark char* fields in struct cgit_page as const
Signed-off-by: John Keeping <john@keeping.me.uk>
-rw-r--r--cgit.h12
-rw-r--r--ui-plain.c3
2 files changed, 8 insertions, 7 deletions
diff --git a/cgit.h b/cgit.h
index fc3fc6f..7581cc1 100644
--- a/cgit.h
+++ b/cgit.h
@@ -245,13 +245,13 @@ struct cgit_page {
245 time_t modified; 245 time_t modified;
246 time_t expires; 246 time_t expires;
247 size_t size; 247 size_t size;
248 char *mimetype; 248 const char *mimetype;
249 char *charset; 249 const char *charset;
250 char *filename; 250 const char *filename;
251 char *etag; 251 const char *etag;
252 char *title; 252 const char *title;
253 int status; 253 int status;
254 char *statusmsg; 254 const char *statusmsg;
255}; 255};
256 256
257struct cgit_environment { 257struct cgit_environment {
diff --git a/ui-plain.c b/ui-plain.c
index 4397a59..482d53a 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -100,8 +100,9 @@ static int print_object(const unsigned char *sha1, const char *path)
100 ctx.page.etag = sha1_to_hex(sha1); 100 ctx.page.etag = sha1_to_hex(sha1);
101 cgit_print_http_headers(&ctx); 101 cgit_print_http_headers(&ctx);
102 html_raw(buf, size); 102 html_raw(buf, size);
103 /* If we allocated this, then casting away const is safe. */
103 if (freemime) 104 if (freemime)
104 free(ctx.page.mimetype); 105 free((char*) ctx.page.mimetype);
105 return 1; 106 return 1;
106} 107}
107 108