summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>2009-01-16 20:29:28 -0500
committerKarolin Seeger <kseeger@samba.org>2009-01-28 09:40:06 +0100
commitff5fcc5538b8f17a56fd4533f25bd2cb25523089 (patch)
tree0c770d74ae21f227efae1d0ea588e7975d0301e1 /source
parent6b21fd6bfb3f70667b6c6b1292557e889cdabffb (diff)
downloadsamba-ff5fcc5538b8f17a56fd4533f25bd2cb25523089.tar.gz
[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 91d30b8a3406d01b5fca97a96ad5964703813f0e)
Diffstat (limited to 'source')
-rw-r--r--source/include/libsmb_internal.h10
-rw-r--r--source/libsmb/libsmb_dir.c2
-rw-r--r--source/libsmb/libsmb_path.c8
3 files changed, 5 insertions, 15 deletions
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 307d6b261d2..a00547f34eb 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 5fe27318fa0..b0762e89a34 100644
--- a/source/libsmb/libsmb_dir.c
+++ b/source/libsmb/libsmb_dir.c
@@ -894,7 +894,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)
{