Mark char* fields in struct cgit_page as const

Signed-off-by: John Keeping <john@keeping.me.uk>

diff --git a/cgit.h b/cgit.h
index fc3fc6fb29b36cd65db6fa2231ea3caa8f248229..7581cc1a053888c57f24f31735c82fe4cd5412e4 100644 (file)
--- a/cgit.h
+++ b/cgit.h
@@ -245,13 +245,13 @@ struct cgit_page {
        time_t modified;
        time_t expires;
        size_t size;
-       char *mimetype;
-       char *charset;
-       char *filename;
-       char *etag;
-       char *title;
+       const char *mimetype;
+       const char *charset;
+       const char *filename;
+       const char *etag;
+       const char *title;
        int status;
-       char *statusmsg;
+       const char *statusmsg;
 };
 
 struct cgit_environment {

diff --git a/ui-plain.c b/ui-plain.c
index 4397a59e3809da6cf71c84ddd5b2c7d3afe94b2e..482d53a89f3d02d231f71fbee5d70874a618c1b4 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -100,8 +100,9 @@ static int print_object(const unsigned char *sha1, const char *path)
        ctx.page.etag = sha1_to_hex(sha1);
        cgit_print_http_headers(&ctx);
        html_raw(buf, size);
+       /* If we allocated this, then casting away const is safe. */
        if (freemime)
-               free(ctx.page.mimetype);
+               free((char*) ctx.page.mimetype);
        return 1;
 }