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/lib/util_str.c | |
parent | 47a7f0cfb5006fb41239a6cd81cce5e35fde750a (diff) | |
download | samba-634c54310c92c48dd4eceec602e230a021bdcfc5.tar.gz samba-634c54310c92c48dd4eceec602e230a021bdcfc5.tar.bz2 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/lib/util_str.c')
-rw-r--r-- | source3/lib/util_str.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 5a1f159bdb..c519fd8497 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -576,7 +576,7 @@ size_t strhex_to_str(char *p, size_t len, const char *strhex) size_t i; size_t num_chars = 0; unsigned char lonybble, hinybble; - char *hexchars = "0123456789ABCDEF"; + const char *hexchars = "0123456789ABCDEF"; char *p1 = NULL, *p2 = NULL; for (i = 0; i < len && strhex[i] != 0; i++) { @@ -958,7 +958,7 @@ void split_at_last_component(char *path, char *front, char sep, char *back) Write an octal as a string. ****************************************************************************/ -char *octal_string(int i) +const char *octal_string(int i) { static char ret[64]; if (i == -1) |