diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-01-02 09:07:17 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-02 09:07:17 +0000 |
| commit | 6d66fb308ab85bd9691d541764e683e6040cf724 (patch) | |
| tree | 10b705921665cb7bafdd332ca53b8a943e13f0e5 /source3/web/cgi.c | |
| parent | c105c12d122e599fe57dde8b2b73c52231f0c1d2 (diff) | |
| download | samba-6d66fb308ab85bd9691d541764e683e6040cf724.tar.gz samba-6d66fb308ab85bd9691d541764e683e6040cf724.tar.bz2 samba-6d66fb308ab85bd9691d541764e683e6040cf724.zip | |
BIG patch...
This patch makes Samba compile cleanly with -Wwrite-strings.
- That is, all string literals are marked as 'const'. These strings are
always read only, this just marks them as such for passing to other functions.
What is most supprising is that I didn't need to change more than a few lines of code (all
in 'net', which got a small cleanup of net.h and extern variables). The rest
is just adding a lot of 'const'.
As far as I can tell, I have not added any new warnings - apart from making all
of tdbutil.c's function const (so they warn for adding that const string to
struct).
Andrew Bartlett
(This used to be commit 92a777d0eaa4fb3a1c7835816f93c6bdd456816d)
Diffstat (limited to 'source3/web/cgi.c')
| -rw-r--r-- | source3/web/cgi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c index 96520c0eef..018dd3602f 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -40,7 +40,7 @@ static int num_variables; static int content_length; static int request_post; static char *query_string; -static char *baseurl; +static const char *baseurl; static char *pathinfo; static char *C_user; static BOOL inetd_server; @@ -205,7 +205,7 @@ void cgi_load_variables(void) browser. Also doesn't allow for variables[] containing multiple variables with the same name and the same or different values. ***************************************************************************/ -char *cgi_variable(char *name) +const char *cgi_variable(const char *name) { int i; @@ -218,7 +218,7 @@ char *cgi_variable(char *name) /*************************************************************************** tell a browser about a fatal error in the http processing ***************************************************************************/ -static void cgi_setup_error(char *err, char *header, char *info) +static void cgi_setup_error(const char *err, const char *header, const char *info) { if (!got_request) { /* damn browsers don't like getting cut off before they give a request */ @@ -264,10 +264,10 @@ authenticate when we are running as a CGI ***************************************************************************/ static void cgi_web_auth(void) { - char *user = getenv("REMOTE_USER"); + const char *user = getenv("REMOTE_USER"); struct passwd *pwd; - char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n"; - char *tail = "</BODY></HTML>\r\n"; + const char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n"; + const char *tail = "</BODY></HTML>\r\n"; if (!user) { printf("%sREMOTE_USER not set. Not authenticated by web server.<br>%s\n", @@ -296,7 +296,7 @@ decode a base64 string in-place - simple and slow algorithm ***************************************************************************/ static void base64_decode(char *s) { - char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int bit_offset, byte_offset, idx, i, n; unsigned char *d = (unsigned char *)s; char *p; @@ -570,7 +570,7 @@ void cgi_setup(const char *rootdir, int auth_required) /*************************************************************************** return the current pages URL ***************************************************************************/ -char *cgi_baseurl(void) +const char *cgi_baseurl(void) { if (inetd_server) { return baseurl; @@ -581,7 +581,7 @@ char *cgi_baseurl(void) /*************************************************************************** return the current pages path info ***************************************************************************/ -char *cgi_pathinfo(void) +const char *cgi_pathinfo(void) { char *r; if (inetd_server) { |