[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4830-gbf7eb01

[Derrell Lipman]

The branch, v3-3-test has been updated
       via  bf7eb0164b0c69d5d0f3019f3aa524846f6a4394 (commit)
      from  20b765f0a20fe7329559e4bf2a9dac4fe8e13c18 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit bf7eb0164b0c69d5d0f3019f3aa524846f6a4394
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Fri Jan 16 20:30:11 2009 -0500

    [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

-----------------------------------------------------------------------

Summary of changes:
 source/include/libsmb_internal.h |   10 ----------
 source/libsmb/libsmb_dir.c       |    2 +-
 source/libsmb/libsmb_path.c      |    8 ++++----
 3 files changed, 5 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 8b410b4..67add07 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 3b4bdfc..761b805 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 b0970d4..6d69924 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)
 {


-- 
Samba Shared Repository