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 | 634c54310c92c48dd4eceec602e230a021bdcfc5 (patch) | |
| tree | 9f5732a180b8daacf176e42511b0a72c972c7a4b /source3/client | |
| parent | 47a7f0cfb5006fb41239a6cd81cce5e35fde750a (diff) | |
| download | samba-634c54310c92c48dd4eceec602e230a021bdcfc5.tar.gz samba-634c54310c92c48dd4eceec602e230a021bdcfc5.tar.xz samba-634c54310c92c48dd4eceec602e230a021bdcfc5.zip | |
Merge from HEAD - make Samba compile with -Wwrite-strings without additional
warnings. (Adds a lot of const).
Andrew Bartlett
(This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
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 76e07cb4f32..feb9e07d169 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 bf4b6e592ab..e8be5e04e7a 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 4c90db4114b..c42cc7b91ff 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 */ |