diff options
author | Andrew Tridgell <tridge@samba.org> | 2004-10-09 07:11:21 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:59:40 -0500 |
commit | 7b7619e0ba489329ced5f5159f97ba7da5aa3fa5 (patch) | |
tree | 3aa0339df6ff36ee2ab6388c24d8fd1471397861 /source4/lib/util_str.c | |
parent | 6350e5cb601f64524f1ea9584cb290055ca04147 (diff) | |
download | samba-7b7619e0ba489329ced5f5159f97ba7da5aa3fa5.tar.gz samba-7b7619e0ba489329ced5f5159f97ba7da5aa3fa5.tar.bz2 samba-7b7619e0ba489329ced5f5159f97ba7da5aa3fa5.zip |
r2871: - got rid of the last bits of non-threadsafe data in util_str.o
- switch the fallback case tables to use talloc
- moved the used-once octal_string() inline in loadparm.c
(This used to be commit b04202eaacc87d264d463f75673ee0e68cd54f94)
Diffstat (limited to 'source4/lib/util_str.c')
-rw-r--r-- | source4/lib/util_str.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c index c4c68a3dcd..89c26e6d22 100644 --- a/source4/lib/util_str.c +++ b/source4/lib/util_str.c @@ -612,19 +612,6 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len) } } -/** - Write an octal as a string. -**/ - -const char *octal_string(int i) -{ - static char ret[64]; - if (i == -1) - return "-1"; - slprintf(ret, sizeof(ret)-1, "0%o", i); - return ret; -} - /** Strchr and strrchr_m are a bit complex on general multi-byte strings. @@ -954,13 +941,13 @@ void rfc1738_unescape(char *buf) } } -static const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - /** * Decode a base64 string into a DATA_BLOB - simple and slow algorithm **/ DATA_BLOB base64_decode_data_blob(const char *s) { + const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + int bit_offset, byte_offset, idx, i, n; DATA_BLOB decoded = data_blob(s, strlen(s)+1); uint8_t *d = decoded.data; @@ -1010,6 +997,7 @@ void base64_decode_inplace(char *s) **/ char * base64_encode_data_blob(DATA_BLOB data) { + const char *b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; int bits = 0; int char_count = 0; size_t out_cnt = 0; |