summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-08-26 03:06:48 +0000
committerAndrew Tridgell <tridge@samba.org>1998-08-26 03:06:48 +0000
commit520d24c191941289ae1e86bc372cde4908a9fa35 (patch)
treeb08d6cdaa70faaa33f27737fd383997666334222 /source3
parentf1451f5d2e97360a39fdee1b26e140de5619673f (diff)
downloadsamba-520d24c191941289ae1e86bc372cde4908a9fa35.tar.gz
samba-520d24c191941289ae1e86bc372cde4908a9fa35.tar.bz2
samba-520d24c191941289ae1e86bc372cde4908a9fa35.zip
use a separate ZERO_ARRAY() macro instead of ZERO_STRUCT() for
arrays. This prevents (harmless) warnings from some compilers (This used to be commit c2da46d1d0820a86e7f77506563cfe7f67b08fee)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smb.h1
-rw-r--r--source3/lsarpcd/srv_lsa.c2
-rw-r--r--source3/rpc_server/srv_lsa.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 00c5464251..31e3b645b1 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1562,6 +1562,7 @@ extern int unix_ERR_code;
/* useful macros */
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
+#define ZERO_ARRAY(x) memset((char *)(x), 0, sizeof(x))
#define SMB_ASSERT(b) ((b)?(void)0: \
(DEBUG(0,("PANIC: assert failed at %s(%d)\n", \
__FILE__, __LINE__)), smb_panic("assert failed")))
diff --git a/source3/lsarpcd/srv_lsa.c b/source3/lsarpcd/srv_lsa.c
index 0675743eee..35ceeace04 100644
--- a/source3/lsarpcd/srv_lsa.c
+++ b/source3/lsarpcd/srv_lsa.c
@@ -392,7 +392,7 @@ static void api_lsa_lookup_names( int uid, prs_struct *data,
ZERO_STRUCT(sid_S_1_1);
ZERO_STRUCT(sid_S_1_3);
ZERO_STRUCT(sid_S_1_5);
- ZERO_STRUCT(dom_rids);
+ ZERO_ARRAY(dom_rids);
/* grab the info class and policy handle */
lsa_io_q_lookup_rids("", &q_l, data, 0);
diff --git a/source3/rpc_server/srv_lsa.c b/source3/rpc_server/srv_lsa.c
index 0675743eee..35ceeace04 100644
--- a/source3/rpc_server/srv_lsa.c
+++ b/source3/rpc_server/srv_lsa.c
@@ -392,7 +392,7 @@ static void api_lsa_lookup_names( int uid, prs_struct *data,
ZERO_STRUCT(sid_S_1_1);
ZERO_STRUCT(sid_S_1_3);
ZERO_STRUCT(sid_S_1_5);
- ZERO_STRUCT(dom_rids);
+ ZERO_ARRAY(dom_rids);
/* grab the info class and policy handle */
lsa_io_q_lookup_rids("", &q_l, data, 0);