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

Derrell Lipman derrell at samba.org
Wed Jul 16 14:45:50 GMT 2008


The branch, v3-3-test has been updated
       via  b731447ec539d454002300fd755dddcad2351d6c (commit)
       via  36e5df59544de9df140ca40ad0efd77afd8e1468 (commit)
       via  11d74fc51c637b8129304b5de85bbe02a86a69ce (commit)
       via  6c33c620072d641fc19ca0224c16af75f6cd7e9e (commit)
       via  e1ade80f468e8ed827f9d4fd035d79546fa0ee0a (commit)
      from  6b7ddb6d664f5f3b62161cdb3abf12633b263a64 (commit)

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


- Log -----------------------------------------------------------------
commit b731447ec539d454002300fd755dddcad2351d6c
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Wed Jul 16 10:45:09 2008 -0400

    The compatibility function also should have a const buffer pointer

commit 36e5df59544de9df140ca40ad0efd77afd8e1468
Author: Andreas Schneider <anschneider at suse.de>
Date:   Wed Jul 16 12:05:52 2008 +0200

    The buf in the smbclient write function should be const.
    
    As we try to provide POSIX function, we should use const like all other
    POSIX function.
    
    Signed-off-by: Andreas Schneider <anschneider at suse.de>
    Signed-off-by: Derrell Lipman <derrell.lipman at unwireduniverse.com>

commit 11d74fc51c637b8129304b5de85bbe02a86a69ce
Merge: 6c33c620072d641fc19ca0224c16af75f6cd7e9e 6b7ddb6d664f5f3b62161cdb3abf12633b263a64
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Wed Jul 16 09:48:23 2008 -0400

    Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test

commit 6c33c620072d641fc19ca0224c16af75f6cd7e9e
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Wed Jul 16 09:47:06 2008 -0400

    Static libsmbclient library needs to include all objects
    
      LIBSMBCLIENT_OBJ0 contains only the libsmb/libsmb_*.o files.  We need the
      more inclusive set of object files defined by LIBSMBCLIENT_OBJ1.
    
    Derrell

commit e1ade80f468e8ed827f9d4fd035d79546fa0ee0a
Author: Derrell Lipman <derrell.lipman at unwireduniverse.com>
Date:   Wed Jul 16 09:45:02 2008 -0400

    Fix typos.
    
      libsmbclient doesn't have bool defined; rather it uses smbc_bool
    
    Derrell

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

Summary of changes:
 source/Makefile.in               |    4 ++--
 source/include/libsmb_internal.h |    2 +-
 source/include/libsmbclient.h    |    6 +++---
 source/libsmb/libsmb_compat.c    |    2 +-
 source/libsmb/libsmb_context.c   |    2 +-
 source/libsmb/libsmb_file.c      |    2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 8b0a5f0..cd70183 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1924,9 +1924,9 @@ $(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
 	@rm -f $@
 	@ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
 
-$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
+$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
+	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1)
 
 libsmbclient: $(LIBSMBCLIENT)
 
diff --git a/source/include/libsmb_internal.h b/source/include/libsmb_internal.h
index 6930812..3b909d1 100644
--- a/source/include/libsmb_internal.h
+++ b/source/include/libsmb_internal.h
@@ -346,7 +346,7 @@ SMBC_read_ctx(SMBCCTX *context,
 ssize_t
 SMBC_write_ctx(SMBCCTX *context,
                SMBCFILE *file,
-               void *buf,
+               const void *buf,
                size_t count);
 
 int
diff --git a/source/include/libsmbclient.h b/source/include/libsmbclient.h
index 2828e9e..a8b27b7 100644
--- a/source/include/libsmbclient.h
+++ b/source/include/libsmbclient.h
@@ -796,7 +796,7 @@ void smbc_setFunctionRead(SMBCCTX *c, smbc_read_fn fn);
 
 typedef ssize_t (*smbc_write_fn)(SMBCCTX *c,
                                  SMBCFILE *file,
-                                 void *buf,
+                                 const void *buf,
                                  size_t count);
 smbc_write_fn smbc_getFunctionWrite(SMBCCTX *c);
 void smbc_setFunctionWrite(SMBCCTX *c, smbc_write_fn fn);
@@ -1240,7 +1240,7 @@ ssize_t smbc_read(int fd, void *buf, size_t bufsize);
  * @see             smbc_open(), smbc_read()
  *
  */
-ssize_t smbc_write(int fd, void *buf, size_t bufsize);
+ssize_t smbc_write(int fd, const void *buf, size_t bufsize);
 
 
 /**@ingroup file
@@ -2584,7 +2584,7 @@ void
 smbc_set_credentials(char *workgroup,
                      char *user,
                      char *password,
-                     bool use_kerberos,
+                     smbc_bool use_kerberos,
                      char *signing_state);
 
 
diff --git a/source/libsmb/libsmb_compat.c b/source/libsmb/libsmb_compat.c
index 9ef5e51..ad8fd92 100644
--- a/source/libsmb/libsmb_compat.c
+++ b/source/libsmb/libsmb_compat.c
@@ -207,7 +207,7 @@ smbc_read(int fd,
 
 ssize_t
 smbc_write(int fd,
-           void *buf,
+           const void *buf,
            size_t bufsize)
 {
 	SMBCFILE * file = find_fd(fd);
diff --git a/source/libsmb/libsmb_context.c b/source/libsmb/libsmb_context.c
index 114f775..be26a92 100644
--- a/source/libsmb/libsmb_context.c
+++ b/source/libsmb/libsmb_context.c
@@ -636,7 +636,7 @@ void
 smbc_set_credentials(char *workgroup,
                      char *user,
                      char *password,
-                     bool use_kerberos,
+                     smbc_bool use_kerberos,
                      char *signing_state)
 {
         
diff --git a/source/libsmb/libsmb_file.c b/source/libsmb/libsmb_file.c
index 423450b..7b28709 100644
--- a/source/libsmb/libsmb_file.c
+++ b/source/libsmb/libsmb_file.c
@@ -329,7 +329,7 @@ SMBC_read_ctx(SMBCCTX *context,
 ssize_t
 SMBC_write_ctx(SMBCCTX *context,
                SMBCFILE *file,
-               void *buf,
+               const void *buf,
                size_t count)
 {
 	int ret;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list