summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-10-13 00:40:57 +0200
committerGünther Deschner <gd@samba.org>2008-10-13 00:40:57 +0200
commitd5a11f9679be9d053838074f1dad5a0ca880750f (patch)
treec9c02cd0c832774a563044fd21b6b20b6131b921
parentf97d92ccbc1779f88a76703f2f83db170cf1abaf (diff)
downloadsamba-d5a11f9679be9d053838074f1dad5a0ca880750f.tar.gz
samba-d5a11f9679be9d053838074f1dad5a0ca880750f.tar.bz2
samba-d5a11f9679be9d053838074f1dad5a0ca880750f.zip
fix build warnings.
Guenther
-rw-r--r--lib/util/xfile.c4
-rw-r--r--source3/libads/ldap.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 36d56e59ff..e8bb811416 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -105,7 +105,7 @@ XFILE *x_fopen(const char *fname, int flags, mode_t mode)
{
XFILE *ret;
- ret = malloc_p(XFILE);
+ ret = (XFILE *)malloc_p(XFILE);
if (!ret) return NULL;
memset(ret, 0, sizeof(XFILE));
@@ -403,7 +403,7 @@ XFILE *x_fdup(const XFILE *f)
return NULL;
}
- ret = malloc_p(XFILE);
+ ret = (XFILE *)malloc_p(XFILE);
if (!ret) {
close(fd);
return NULL;
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index e78465f7da..fbbe1a546b 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -801,7 +801,7 @@ static ADS_STATUS ads_do_paged_search_args(ADS_STRUCT *ads,
int *count, struct berval **cookie)
{
int rc, i, version;
- char *utf8_expr, *utf8_path, **search_attrs;
+ char *utf8_expr, *utf8_path, **search_attrs = NULL;
size_t converted_size;
LDAPControl PagedResults, NoReferrals, ExternalCtrl, *controls[4], **rcontrols;
BerElement *cookie_be = NULL;