summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2015-03-03 08:48:00 +0100
committerVolker Lendecke <vl@samba.org>2015-03-03 13:14:53 +0100
commit38628b1e32cb480cbd0cef57a34a9fe0216f344c (patch)
treed39fb17f31ef0f0c0f42f39c829d3d050a7e0f7e /source3
parentb3385f74db54bd8a07a0be5515151b633c067da4 (diff)
downloadsamba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.tar.gz
samba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.tar.xz
samba-38628b1e32cb480cbd0cef57a34a9fe0216f344c.zip
Fix the O3 developer build
Different gcc versions complain at different places Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Tue Mar 3 13:14:53 CET 2015 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/ctdbd_conn.c6
-rw-r--r--source3/lib/netapi/file.c2
-rw-r--r--source3/lib/netapi/share.c2
-rw-r--r--source3/passdb/pdb_ipa.c2
-rw-r--r--source3/utils/net_registry.c4
5 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index c41ec530a7..6e2576998a 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -722,7 +722,7 @@ static void ctdbd_socket_handler(struct tevent_context *event_ctx,
{
struct ctdbd_connection *conn = talloc_get_type_abort(
private_data, struct ctdbd_connection);
- struct ctdb_req_header *hdr;
+ struct ctdb_req_header *hdr = NULL;
NTSTATUS status;
status = ctdb_read_packet(conn->fd, talloc_tos(), &hdr);
@@ -1304,7 +1304,7 @@ char *ctdbd_dbpath(struct ctdbd_connection *conn,
{
NTSTATUS status;
TDB_DATA data;
- int32_t cstatus;
+ int32_t cstatus = 0;
data.dptr = (uint8_t*)&db_id;
data.dsize = sizeof(db_id);
@@ -1557,7 +1557,7 @@ NTSTATUS ctdbd_traverse(uint32_t db_id,
}
while (True) {
- struct ctdb_req_header *hdr;
+ struct ctdb_req_header *hdr = NULL;
struct ctdb_req_message *m;
struct ctdb_rec_data *d;
diff --git a/source3/lib/netapi/file.c b/source3/lib/netapi/file.c
index 551f9ff4f0..99541b9757 100644
--- a/source3/lib/netapi/file.c
+++ b/source3/lib/netapi/file.c
@@ -240,7 +240,7 @@ WERROR NetFileEnum_r(struct libnetapi_ctx *ctx,
}
for (i=0; i < info_ctr.ctr.ctr2->count; i++) {
- union srvsvc_NetFileInfo _i;
+ union srvsvc_NetFileInfo _i = {0};
switch (r->in.level) {
case 2:
_i.info2 = &info_ctr.ctr.ctr2->array[i];
diff --git a/source3/lib/netapi/share.c b/source3/lib/netapi/share.c
index 37b23221be..1694a279c0 100644
--- a/source3/lib/netapi/share.c
+++ b/source3/lib/netapi/share.c
@@ -386,7 +386,7 @@ WERROR NetShareEnum_r(struct libnetapi_ctx *ctx,
}
for (i=0; i < info_ctr.ctr.ctr1->count; i++) {
- union srvsvc_NetShareInfo _i;
+ union srvsvc_NetShareInfo _i = {0};
switch (r->in.level) {
case 0:
_i.info0 = &info_ctr.ctr.ctr0->array[i];
diff --git a/source3/passdb/pdb_ipa.c b/source3/passdb/pdb_ipa.c
index 9a1cc1836c..e1e5527617 100644
--- a/source3/passdb/pdb_ipa.c
+++ b/source3/passdb/pdb_ipa.c
@@ -1303,7 +1303,7 @@ static NTSTATUS ipasam_create_dom_group(struct pdb_methods *pdb_methods,
{
NTSTATUS status;
struct ldapsam_privates *ldap_state;
- char *dn;
+ char *dn = NULL;
uint32_t has_objectclass = 0;
ldap_state = (struct ldapsam_privates *)(pdb_methods->private_data);
diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index befc73c4e4..cdfb318154 100644
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -274,7 +274,7 @@ static int net_registry_createkey(struct net_context *c, int argc,
{
WERROR werr;
enum winreg_CreateAction action;
- char *subkeyname;
+ char *subkeyname = NULL;
struct registry_key *hivekey = NULL;
struct registry_key *subkey = NULL;
TALLOC_CTX *ctx = talloc_stackframe();
@@ -333,7 +333,7 @@ static int net_registry_deletekey_internal(struct net_context *c, int argc,
bool recursive)
{
WERROR werr;
- char *subkeyname;
+ char *subkeyname = NULL;
struct registry_key *hivekey = NULL;
TALLOC_CTX *ctx = talloc_stackframe();
int ret = -1;