diff options
| author | Derrell Lipman <derrell.lipman@unwireduniverse.com> | 2009-01-16 20:30:11 -0500 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-01-20 14:16:48 +0100 |
| commit | 3a964d47446e08208435757829131efa9a4ccac3 (patch) | |
| tree | 4be27af37d05201ccabafc8b42f147303d19e380 | |
| parent | 5381e478416e1c7e08b938a06b0491bdda169c39 (diff) | |
| download | samba-3a964d47446e08208435757829131efa9a4ccac3.tar.gz samba-3a964d47446e08208435757829131efa9a4ccac3.tar.xz samba-3a964d47446e08208435757829131efa9a4ccac3.zip | |
[Bug 6022] smbc_urlencode and smbc_urldecode were not exported
- Since the revamp of libsmbclient, there has still been an external
declaration for smbc_urlencode and smbc_urldecode in libsmbclient.h, yet
those functions were renamed and made private. The two choices were to
remove the function names from libsmbclient.h or to make them public
again. The reported requested that they be public. This commit makes it so.
Derrell
(cherry picked from commit bf7eb0164b0c69d5d0f3019f3aa524846f6a4394)
| -rw-r--r-- | source/include/libsmb_internal.h | 10 | ||||
| -rw-r--r-- | source/libsmb/libsmb_dir.c | 2 | ||||
| -rw-r--r-- | source/libsmb/libsmb_path.c | 8 |
3 files changed, 5 insertions, 15 deletions
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h index 8b410b4f7f9..67add074bfc 100644 --- a/source/include/libsmb_internal.h +++ b/source/include/libsmb_internal.h @@ -402,16 +402,6 @@ SMBC_errno(SMBCCTX *context, /* Functions in libsmb_path.c */ int -SMBC_urldecode(char *dest, - char *src, - size_t max_dest_len); - -int -SMBC_urlencode(char *dest, - char *src, - int max_dest_len); - -int SMBC_parse_path(TALLOC_CTX *ctx, SMBCCTX *context, const char *fname, diff --git a/source/libsmb/libsmb_dir.c b/source/libsmb/libsmb_dir.c index 3b4bdfccef5..761b8055091 100644 --- a/source/libsmb/libsmb_dir.c +++ b/source/libsmb/libsmb_dir.c @@ -895,7 +895,7 @@ smbc_readdir_internal(SMBCCTX * context, /* url-encode the name. get back remaining buffer space */ max_namebuf_len = - SMBC_urlencode(dest->name, src->name, max_namebuf_len); + smbc_urlencode(dest->name, src->name, max_namebuf_len); /* We now know the name length */ dest->namelen = strlen(dest->name); diff --git a/source/libsmb/libsmb_path.c b/source/libsmb/libsmb_path.c index b0970d46db4..6d69924231b 100644 --- a/source/libsmb/libsmb_path.c +++ b/source/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) { |