summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2005-03-10 10:20:36 +0000
committerSimon Tatham <anakin@pobox.com>2005-03-10 10:20:36 +0000
commitcf872c750ac9c937cb77d4bb31abf70d1c4afac7 (patch)
treec296b2d1a4edbbac7fa1c6e30716f6255975de18
parentf3bcc430298edf9a72becfb14ee99e924e4ff2c0 (diff)
downloadhalibut-cf872c750ac9c937cb77d4bb31abf70d1c4afac7.zip
halibut-cf872c750ac9c937cb77d4bb31abf70d1c4afac7.tar.gz
halibut-cf872c750ac9c937cb77d4bb31abf70d1c4afac7.tar.bz2
halibut-cf872c750ac9c937cb77d4bb31abf70d1c4afac7.tar.xz
Explicitly constify a bunch of static data declarations which were
conceptually const but not declared as such. Halibut is now back to the practically-speaking-pointless but rather satisfying status of having no global writable data whatsoever :-) [originally from svn r5476] [this svn revision also touched charset,filter,timber]
-rw-r--r--bk_html.c2
m---------charset0
-rw-r--r--help.c8
-rw-r--r--licence.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/bk_html.c b/bk_html.c
index 4da897f..3cd8eca 100644
--- a/bk_html.c
+++ b/bk_html.c
@@ -2101,7 +2101,7 @@ static char *html_sanitise_fragment(htmlfilelist *files, htmlfile *file,
/* If there's nothing left, make something valid up */
if (!*text) {
- static const char *anonfrag = "anon";
+ static const char *const anonfrag = "anon";
text = sresize(text, lenof(anonfrag), char);
strcpy(text, anonfrag);
}
diff --git a/charset b/charset
-Subproject c98bc7ce138a1f3d73864ac0ad7fe0abeb34791
+Subproject e9e7dc73edbeb50744e54ed65cbffdd06f53fb7
diff --git a/help.c b/help.c
index e31f784..8db2859 100644
--- a/help.c
+++ b/help.c
@@ -5,7 +5,7 @@
#include <stdio.h>
#include "halibut.h"
-static char *helptext[] = {
+static const char *const helptext[] = {
"usage: halibut [options] files",
"options: --text[=filename] generate plain text output",
" --html[=filename] generate XHTML output",
@@ -24,19 +24,19 @@ static char *helptext[] = {
NULL
};
-static char *usagetext[] = {
+static const char *const usagetext[] = {
"usage: halibut [--format[=filename]] [options] file.but [file.but...]",
NULL
};
void help(void) {
- char **p;
+ const char *const *p;
for (p = helptext; *p; p++)
puts(*p);
}
void usage(void) {
- char **p;
+ const char *const *p;
for (p = usagetext; *p; p++)
puts(*p);
}
diff --git a/licence.c b/licence.c
index b53ae97..386259b 100644
--- a/licence.c
+++ b/licence.c
@@ -4,7 +4,7 @@
#include <stdio.h>
-static char *licencetext[] = {
+static const char *const licencetext[] = {
"Halibut is copyright (c) 1999-2005 Simon Tatham and James Aylett.",
"",
"Permission is hereby granted, free of charge, to any person",
@@ -30,7 +30,7 @@ static char *licencetext[] = {
};
void licence(void) {
- char **p;
+ const char *const *p;
for (p = licencetext; *p; p++)
puts(*p);
}