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/client | |
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/client')
-rw-r--r-- | source3/client/client.c | 4 | ||||
-rw-r--r-- | source3/client/clitar.c | 12 | ||||
-rw-r--r-- | source3/client/smbspool.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 76e07cb4f3..feb9e07d16 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -2057,9 +2057,9 @@ static BOOL list_servers(char *wk_grp) */ static struct { - char *name; + const char *name; int (*fn)(void); - char *description; + const char *description; char compl_args[2]; /* Completion argument info */ } commands[] = { diff --git a/source3/client/clitar.c b/source3/client/clitar.c index bf4b6e592a..e8be5e04e7 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -121,12 +121,12 @@ extern int get_total_size; static int blocksize=20; static int tarhandle; -static void writetarheader(int f, char *aname, SMB_BIG_UINT size, time_t mtime, - char *amode, unsigned char ftype); +static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t mtime, + const char *amode, unsigned char ftype); static void do_atar(char *rname,char *lname,file_info *finfo1); static void do_tar(file_info *finfo); static void oct_it(SMB_BIG_UINT value, int ndgs, char *p); -static void fixtarname(char *tptr, char *fp, int l); +static void fixtarname(char *tptr, const char *fp, int l); static int dotarbuf(int f, char *b, int n); static void dozerobuf(int f, int n); static void dotareof(int f); @@ -164,8 +164,8 @@ static char *string_create_s(int size) /**************************************************************************** Write a tar header to buffer ****************************************************************************/ -static void writetarheader(int f, char *aname, SMB_BIG_UINT size, time_t mtime, - char *amode, unsigned char ftype) +static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t mtime, + const char *amode, unsigned char ftype) { union hblock hb; int i, chk, l; @@ -414,7 +414,7 @@ static void dotareof(int f) /**************************************************************************** (Un)mangle DOS pathname, make nonabsolute ****************************************************************************/ -static void fixtarname(char *tptr, char *fp, int l) +static void fixtarname(char *tptr, const char *fp, int l) { /* add a '.' to start of file name, convert from ugly dos \'s in path * to lovely unix /'s :-} */ diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index 4c90db4114..c42cc7b91f 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -52,8 +52,8 @@ static int smb_print(struct cli_state *, char *, FILE *); int copies; /* Number of copies */ char uri[1024], /* URI */ *sep, /* Pointer to separator */ - *username, /* Username */ - *password, /* Password */ + *password; /* Password */ + const char *username, /* Username */ *server, /* Server name */ *printer; /* Printer name */ const char *workgroup; /* Workgroup */ |