diff options
author | Andrew Bartlett <abartlet@samba.org> | 2003-01-03 08:28:12 +0000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2003-01-03 08:28:12 +0000 |
commit | 3a7458f9472432ef12c43008414925fd1ce8ea0c (patch) | |
tree | 185f6140d3895e4d5304e4ef3f5ce4d7a34a7e82 /source/web/swat.c | |
parent | 96e9fa5f224966531fa8f9cf18cbc4bbb2fe60ed (diff) | |
download | samba-3a7458f9472432ef12c43008414925fd1ce8ea0c.tar.gz samba-3a7458f9472432ef12c43008414925fd1ce8ea0c.tar.xz samba-3a7458f9472432ef12c43008414925fd1ce8ea0c.zip |
Merge from HEAD - make Samba compile with -Wwrite-strings without additional
warnings. (Adds a lot of const).
Andrew Bartlett
Diffstat (limited to 'source/web/swat.c')
-rw-r--r-- | source/web/swat.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source/web/swat.c b/source/web/swat.c index fc388522454..21ae104ceff 100644 --- a/source/web/swat.c +++ b/source/web/swat.c @@ -59,7 +59,7 @@ static int iNumNonAutoPrintServices = 0; /**************************************************************************** ****************************************************************************/ -static int enum_index(int value, struct enum_list *enumlist) +static int enum_index(int value, const struct enum_list *enumlist) { int i; for (i=0;enumlist[i].name;i++) @@ -67,7 +67,7 @@ static int enum_index(int value, struct enum_list *enumlist) return(i); } -static char *fix_backslash(char *str) +static char *fix_backslash(const char *str) { static char newstring[1024]; char *p = newstring; @@ -81,7 +81,7 @@ static char *fix_backslash(char *str) return newstring; } -static char *stripspaceupper(char *str) +static char *stripspaceupper(const char *str) { static char newstring[1024]; char *p = newstring; @@ -94,7 +94,7 @@ static char *stripspaceupper(char *str) return newstring; } -static char *make_parm_name(char *label) +static char *make_parm_name(const char *label) { static char parmname[1024]; char *p = parmname; @@ -111,7 +111,7 @@ static char *make_parm_name(char *label) /**************************************************************************** include a lump of html in a page ****************************************************************************/ -static int include_html(char *fname) +static int include_html(const char *fname) { int fd; char buf[1024]; @@ -303,8 +303,8 @@ static void show_parameters(int snum, int allparameters, unsigned int parm_filte { int i = 0; struct parm_struct *parm; - char *heading = NULL; - char *last_heading = NULL; + const char *heading = NULL; + const char *last_heading = NULL; while ((parm = lp_next_parameter(snum, &i, allparameters))) { if (snum < 0 && parm->class == P_LOCAL && !(parm->flags & FLAG_GLOBAL)) @@ -440,7 +440,7 @@ static int save_reload(int snum) /**************************************************************************** commit one parameter ****************************************************************************/ -static void commit_parameter(int snum, struct parm_struct *parm, char *v) +static void commit_parameter(int snum, struct parm_struct *parm, const char *v) { int i; char *s; @@ -468,7 +468,7 @@ static void commit_parameters(int snum) int i = 0; struct parm_struct *parm; pstring label; - char *v; + const char *v; while ((parm = lp_next_parameter(snum, &i, 1))) { slprintf(label, sizeof(label)-1, "parm_%s", make_parm_name(parm->label)); @@ -817,7 +817,7 @@ static void globals_page(void) ****************************************************************************/ static void shares_page(void) { - char *share = cgi_variable("share"); + const char *share = cgi_variable("share"); char *s; int snum = -1; int i; @@ -915,8 +915,8 @@ static void shares_page(void) /************************************************************* change a password either locally or remotely *************************************************************/ -static BOOL change_password(const char *remote_machine, char *user_name, - char *old_passwd, char *new_passwd, +static BOOL change_password(const char *remote_machine, const char *user_name, + const char *old_passwd, const char *new_passwd, int local_flags) { BOOL ret = False; @@ -957,7 +957,7 @@ static BOOL change_password(const char *remote_machine, char *user_name, ****************************************************************************/ static void chg_passwd(void) { - char *host; + const char *host; BOOL rslt; int local_flags = 0; @@ -1042,7 +1042,7 @@ static void chg_passwd(void) ****************************************************************************/ static void passwd_page(void) { - char *new_name = cgi_user_name(); + const char *new_name = cgi_user_name(); /* * After the first time through here be nice. If the user @@ -1147,7 +1147,7 @@ static void passwd_page(void) ****************************************************************************/ static void printers_page(void) { - char *share = cgi_variable("share"); + const char *share = cgi_variable("share"); char *s; int snum=-1; int i; |