diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 16:19:39 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-18 16:19:39 +0100 |
| commit | bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b (patch) | |
| tree | 068b3849e31c7b90a465be8172aac7c2b472d205 /source3/libsmb/libsmb_path.c | |
| parent | 5cf9989a70a23e5b955b7229fa95d3e604b1883d (diff) | |
| parent | c45b6ec29a5b3a39b83209e970b645e5ed0a411c (diff) | |
| download | samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.gz samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.tar.bz2 samba-bfbb0fb17f4eedb8f22d0694c5d4a3b82dfe189b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/libsmb/libsmb_path.c')
| -rw-r--r-- | source3/libsmb/libsmb_path.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libsmb/libsmb_path.c b/source3/libsmb/libsmb_path.c index 2c3a5f8866..6d69924231 100644 --- a/source3/libsmb/libsmb_path.c +++ b/source3/libsmb/libsmb_path.c @@ -41,7 +41,7 @@ hex2int( unsigned int _char ) } /* - * SMBC_urldecode() + * smbc_urldecode() * and urldecode_talloc() (internal fn.) * * Convert strings of %xx to their single character equivalent. Each 'x' must @@ -122,7 +122,7 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src) } int -SMBC_urldecode(char *dest, +smbc_urldecode(char *dest, char *src, size_t max_dest_len) { @@ -138,7 +138,7 @@ SMBC_urldecode(char *dest, } /* - * SMBC_urlencode() + * smbc_urlencode() * * Convert any characters not specifically allowed in a URL into their %xx * equivalent. @@ -146,7 +146,7 @@ SMBC_urldecode(char *dest, * Returns the remaining buffer length. */ int -SMBC_urlencode(char *dest, +smbc_urlencode(char *dest, char *src, int max_dest_len) { @@ -286,7 +286,7 @@ SMBC_parse_path(TALLOC_CTX *ctx, DEBUG(4, ("Found options '%s'", q)); /* Copy the options */ - if (*pp_options != NULL) { + if (pp_options && *pp_options != NULL) { TALLOC_FREE(*pp_options); *pp_options = talloc_strdup(ctx, q); } |