[SCM] Samba Shared Repository - branch v3-6-test updated

Jeremy Allison jra at samba.org
Wed Feb 9 11:46:16 MST 2011


The branch, v3-6-test has been updated
       via  0797ddd Fix up some buildfarm warnings. (cherry picked from commit ea10006ef857d112477f9cb3294a1439b34259e8)
      from  127691c Don't use asprintf in this library - breaks the build on many systems. Fake with malloc/memcpy. (cherry picked from commit 8d0c16a68bac7c75b4b637c6d6e3377c5461e5d4)

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


- Log -----------------------------------------------------------------
commit 0797ddd9cb4fbc66e069dacebe6b5df49c39d322
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Feb 9 10:43:56 2011 -0800

    Fix up some buildfarm warnings.
    (cherry picked from commit ea10006ef857d112477f9cb3294a1439b34259e8)

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

Summary of changes:
 source3/lib/dbwrap_util.c       |    2 +-
 source3/lib/system.c            |    2 +-
 source3/lib/util_str.c          |    2 +-
 source3/libsmb/cli_np_tstream.c |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/dbwrap_util.c b/source3/lib/dbwrap_util.c
index 8ebc4f4..0020fc6 100644
--- a/source3/lib/dbwrap_util.c
+++ b/source3/lib/dbwrap_util.c
@@ -118,7 +118,7 @@ static NTSTATUS dbwrap_change_uint32_atomic_action(struct db_context *db,
 						   void *private_data)
 {
 	struct db_record *rec;
-	uint32 val = -1;
+	uint32_t val = (uint32_t)-1;
 	uint32_t v_store;
 	NTSTATUS ret;
 	struct dbwrap_change_uint32_atomic_context *state;
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 57434f2..1783fda 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -2716,7 +2716,7 @@ int sys_getnameinfo(const struct sockaddr *psa,
 
 int sys_connect(int fd, const struct sockaddr * addr)
 {
-	socklen_t salen = -1;
+	socklen_t salen = (socklen_t)-1;
 
 	if (addr->sa_family == AF_INET) {
 	    salen = sizeof(struct sockaddr_in);
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index fcc4b8d..6edf64d 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -2020,7 +2020,7 @@ char *base64_encode_data_blob(TALLOC_CTX *mem_ctx, DATA_BLOB data)
 uint64_t STR_TO_SMB_BIG_UINT(const char *nptr, const char **entptr)
 {
 
-	uint64_t val = -1;
+	uint64_t val = (uint64_t)-1;
 	const char *p = nptr;
 
 	if (!p) {
diff --git a/source3/libsmb/cli_np_tstream.c b/source3/libsmb/cli_np_tstream.c
index 898b405..1f9e5ff 100644
--- a/source3/libsmb/cli_np_tstream.c
+++ b/source3/libsmb/cli_np_tstream.c
@@ -82,7 +82,7 @@ static int tstream_cli_np_destructor(struct tstream_cli_np *cli_nps)
 	 * We can't do much on failure
 	 */
 	return 0;
-};
+}
 
 struct tstream_cli_np_open_state {
 	struct cli_state *cli;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list