summaryrefslogtreecommitdiffstats
path: root/source/include/smb.h
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1998-11-12 23:35:05 +0000
committerLuke Leighton <lkcl@samba.org>1998-11-12 23:35:05 +0000
commit06abdfd68e1d7fa8741afc3f56ec7a13b5fa4ccc (patch)
tree496a089568c16cda3a1545ba3a9e94c9ffacc3f1 /source/include/smb.h
parent88c90ec65c1a764dd7b13d9fb5ce700027f40cfd (diff)
downloadsamba-06abdfd68e1d7fa8741afc3f56ec7a13b5fa4ccc.tar.gz
samba-06abdfd68e1d7fa8741afc3f56ec7a13b5fa4ccc.tar.xz
samba-06abdfd68e1d7fa8741afc3f56ec7a13b5fa4ccc.zip
security descriptors.
kanji const char* warnings.
Diffstat (limited to 'source/include/smb.h')
-rw-r--r--source/include/smb.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/source/include/smb.h b/source/include/smb.h
index 47a8869a48f..4f064d27d18 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -1655,7 +1655,13 @@ extern int unix_ERR_code;
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
/* zero a structure given a pointer to the structure */
-#define ZERO_STRUCTP(x) memset((char *)(x), 0, sizeof(*(x)))
+#if 0
+#define ZERO_STRUCTP(x) { }
+#else
+#define ZERO_STRUCTP(x) { if (x != NULL) memset((char *)(x), 0, sizeof(*(x))); }
+#endif
+
+#define ZERO_STRUCTPN(x) { if (x != NULL) ZERO_STRUCTP(x); }
/* zero an array - note that sizeof(array) must work - ie. it must not be a
pointer */