[SCM] Samba Shared Repository - branch master updated - 5237369ad8bac6a5fc80e32b313ce9f3266abc0f

Jelmer Vernooij jelmer at samba.org
Sun Oct 12 01:01:53 GMT 2008


The branch, master has been updated
       via  5237369ad8bac6a5fc80e32b313ce9f3266abc0f (commit)
      from  c4d3dc849f48a75653d1b16031e9c0657df4d098 (commit)

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


- Log -----------------------------------------------------------------
commit 5237369ad8bac6a5fc80e32b313ce9f3266abc0f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 12 02:59:30 2008 +0200

    Fix warning, prototype.

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

Summary of changes:
 source3/include/proto.h     |    2 +-
 source4/lib/socket/socket.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 3a74006..08c1e2c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1662,7 +1662,7 @@ int fstr_sprintf(fstring s, const char *fmt, ...);
 char **str_list_make(TALLOC_CTX *mem_ctx, const char *string, const char *sep);
 char **str_list_copy(TALLOC_CTX *mem_ctx, const char **list);
 bool str_list_compare(char **list1, char **list2);
-size_t str_list_length( const char **list );
+size_t str_list_length( const char * const*list );
 bool str_list_sub_basic( char **list, const char *smb_name,
 			 const char *domain_name );
 bool str_list_substitute(char **list, const char *pattern, const char *insert);
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 92f0a44..0c3d032 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -491,7 +491,7 @@ static const struct {
 **/
 _PUBLIC_ void set_socket_options(int fd, const char *options)
 {
-	const char **options_list = str_list_make(NULL, options, " \t,");
+	const char **options_list = (const char **)str_list_make(NULL, options, " \t,");
 	int j;
 
 	if (!options_list)


-- 
Samba Shared Repository


More information about the samba-cvs mailing list