[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-552-g01a5c3e
Jeremy Allison
jra at samba.org
Sat Dec 8 17:50:13 GMT 2007
The branch, v3-2-test has been updated
via 01a5c3ea4bf18d99ca1c35e8c38367046e4c867b (commit)
via 60500fac30911500eade7c2a9aa13569dcab0911 (commit)
from ea8633689d43cc2fe15aedb430b4cac38fa73d14 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 01a5c3ea4bf18d99ca1c35e8c38367046e4c867b
Author: Volker Lendecke <vl at samba.org>
Date: Sat Dec 8 11:21:08 2007 +0100
Fix C++ warnings
commit 60500fac30911500eade7c2a9aa13569dcab0911
Author: Volker Lendecke <vl at samba.org>
Date: Sat Dec 8 11:20:53 2007 +0100
Fix two incompatible pointer warnings
Jeremy, please check
-----------------------------------------------------------------------
Summary of changes:
source/auth/pampass.c | 2 +-
source/client/client.c | 2 +-
source/libsmb/clidfs.c | 2 +-
source/libsmb/clifile.c | 18 +++++++++---------
source/libsmb/clilist.c | 2 +-
source/libsmb/clirap.c | 8 ++++----
source/nmbd/nmbd_winsserver.c | 2 +-
7 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/pampass.c b/source/auth/pampass.c
index 554df3c..58921bd 100644
--- a/source/auth/pampass.c
+++ b/source/auth/pampass.c
@@ -238,7 +238,7 @@ static struct chat_struct *make_pw_chat(const char *p)
strlower_m(t->prompt);
trim_char(t->prompt, ' ', ' ');
- if (!next_token_talloc(frame, &p, reply, NULL)) {
+ if (!next_token_talloc(frame, &p, &reply, NULL)) {
break;
}
diff --git a/source/client/client.c b/source/client/client.c
index bbe5572..1e2f96c 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -4060,7 +4060,7 @@ static char **remote_completion(const char *text, int len)
info.samelen = info.len = len-i-1;
if (i > 0) {
- info.dirmask = SMB_MALLOC(i+2);
+ info.dirmask = SMB_MALLOC_ARRAY(char, i+2);
if (!info.dirmask) {
goto cleanup;
}
diff --git a/source/libsmb/clidfs.c b/source/libsmb/clidfs.c
index f124821..e0c40b5 100644
--- a/source/libsmb/clidfs.c
+++ b/source/libsmb/clidfs.c
@@ -592,7 +592,7 @@ bool cli_dfs_get_referral(TALLOC_CTX *ctx,
*num_refs = 0;
*refs = NULL;
- param = SMB_MALLOC(2+pathlen+2);
+ param = SMB_MALLOC_ARRAY(char, 2+pathlen+2);
if (!param) {
return false;
}
diff --git a/source/libsmb/clifile.c b/source/libsmb/clifile.c
index 70b4fe7..001a42d 100644
--- a/source/libsmb/clifile.c
+++ b/source/libsmb/clifile.c
@@ -37,8 +37,8 @@ static bool cli_link_internal(struct cli_state *cli, const char *oldname, const
size_t oldlen = 2*(strlen(oldname)+1);
size_t newlen = 2*(strlen(newname)+1);
- param = SMB_MALLOC(6+newlen+2);
- data = SMB_MALLOC(oldlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+newlen+2);
+ data = SMB_MALLOC_ARRAY(char, oldlen+2);
if (!param || !data) {
return false;
}
@@ -191,7 +191,7 @@ bool cli_unix_getfacl(struct cli_state *cli, const char *name, size_t *prb_size,
char *rparam=NULL, *rdata=NULL;
char *p;
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -251,7 +251,7 @@ bool cli_unix_stat(struct cli_state *cli, const char *name, SMB_STRUCT_STAT *sbu
ZERO_STRUCTP(sbuf);
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -352,7 +352,7 @@ static bool cli_unix_chmod_chown_internal(struct cli_state *cli, const char *fna
char *rparam=NULL, *rdata=NULL;
char *p;
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -1662,7 +1662,7 @@ bool cli_set_ea_path(struct cli_state *cli, const char *path, const char *ea_nam
char *p;
bool ret;
- param = SMB_MALLOC(6+srclen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
if (!param) {
return false;
}
@@ -1835,7 +1835,7 @@ bool cli_get_ea_list_path(struct cli_state *cli, const char *path,
size_t srclen = 2*(strlen(path)+1);
bool ret;
- param = SMB_MALLOC(6+srclen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
if (!param) {
return false;
}
@@ -1940,7 +1940,7 @@ static int cli_posix_open_internal(struct cli_state *cli, const char *fname, int
uint32 wire_flags = open_flags_to_wire(flags);
size_t srclen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+srclen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
if (!param) {
return false;
}
@@ -2025,7 +2025,7 @@ static bool cli_posix_unlink_internal(struct cli_state *cli, const char *fname,
char *p;
size_t srclen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+srclen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+srclen+2);
if (!param) {
return false;
}
diff --git a/source/libsmb/clilist.c b/source/libsmb/clilist.c
index fc47f94..2e4c360 100644
--- a/source/libsmb/clilist.c
+++ b/source/libsmb/clilist.c
@@ -255,7 +255,7 @@ int cli_list_new(struct cli_state *cli,const char *Mask,uint16 attribute,
break;
}
- param = SMB_MALLOC(12+nlen+last_name_raw.length+2);
+ param = SMB_MALLOC_ARRAY(char, 12+nlen+last_name_raw.length+2);
if (!param) {
break;
}
diff --git a/source/libsmb/clirap.c b/source/libsmb/clirap.c
index c10900c..410b7cb 100644
--- a/source/libsmb/clirap.c
+++ b/source/libsmb/clirap.c
@@ -471,7 +471,7 @@ bool cli_qpathinfo(struct cli_state *cli,
char *p;
size_t nlen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -560,7 +560,7 @@ bool cli_setpathinfo(struct cli_state *cli, const char *fname,
char *p;
size_t nlen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -660,7 +660,7 @@ bool cli_qpathinfo2(struct cli_state *cli, const char *fname,
char *p;
size_t nlen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return false;
}
@@ -989,7 +989,7 @@ NTSTATUS cli_qpathinfo_alt_name(struct cli_state *cli, const char *fname, fstrin
unsigned int len;
size_t nlen = 2*(strlen(fname)+1);
- param = SMB_MALLOC(6+nlen+2);
+ param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
if (!param) {
return NT_STATUS_NO_MEMORY;
}
diff --git a/source/nmbd/nmbd_winsserver.c b/source/nmbd/nmbd_winsserver.c
index 7dafa66..7344a29 100644
--- a/source/nmbd/nmbd_winsserver.c
+++ b/source/nmbd/nmbd_winsserver.c
@@ -655,7 +655,7 @@ bool initialise_wins(void)
continue;
}
- if (!next_token_talloc(frame,&ptr,ttl_str,NULL)) {
+ if (!next_token_talloc(frame,&ptr,&ttl_str,NULL)) {
DEBUG(0,("initialise_wins: Failed to parse time to live when parsing line %s\n", line ));
TALLOC_FREE(frame);
continue;
--
Samba Shared Repository
More information about the samba-cvs
mailing list