[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  472759a s3: remove prototype of convert_string_error from proto.h
       via  8683490 s3: remove prototype of convert_string from proto.h
      from  4f7f143 dfsreferral: search client's site and use it

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 472759a1e407d564d0125ec8f47eee38d62d6e1f
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 21 10:23:51 2011 +0200

    s3: remove prototype of convert_string_error from proto.h
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Thu Jun 23 12:34:31 CEST 2011 on sn-devel-104

commit 8683490748a6ed2eaed11655c96e2838c4aa597b
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jun 21 10:23:17 2011 +0200

    s3: remove prototype of convert_string from proto.h

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

Summary of changes:
 source3/include/proto.h |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index aa99d1c..ef8be4f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -73,14 +73,6 @@ int bitmap_find(struct bitmap *bm, unsigned ofs);
 /* The following definitions come from lib/charcnv.c  */
 
 void gfree_charcnv(void);
-bool convert_string(charset_t from, charset_t to,
-		      void const *src, size_t srclen, 
-		      void *dest, size_t destlen,
-		      size_t *converted_size);
-bool convert_string_error(charset_t from, charset_t to,
-			    void const *src, size_t srclen,
-			    void *dest, size_t destlen,
-			    size_t *converted_size);
 size_t ucs2_align(const void *base_ptr, const void *p, int flags);
 size_t push_ascii(void *dest, const char *src, size_t dest_len, int flags);
 size_t push_ascii_fstring(void *dest, const char *src);


-- 
Samba Shared Repository