diff options
| author | Luke Leighton <lkcl@samba.org> | 1998-11-13 17:26:44 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1998-11-13 17:26:44 +0000 |
| commit | 5e4d4deecaecafa0f858e26b0ae7c6027c49f69d (patch) | |
| tree | 1f00ae2d0647c1cebb621cfb43ce6f44ca56ec65 | |
| parent | 2db96e3047400be594e7c5ebf7d6fcedb77f6907 (diff) | |
| download | samba-5e4d4deecaecafa0f858e26b0ae7c6027c49f69d.tar.gz samba-5e4d4deecaecafa0f858e26b0ae7c6027c49f69d.tar.bz2 samba-5e4d4deecaecafa0f858e26b0ae7c6027c49f69d.zip | |
ZERO_STRUCTP does not check argument for NULL.
ZERO_STRUCTPN _does_ check argument for NULL.
(This used to be commit 0be34ca1402f95506680caa3461e94d4ae54bb7d)
| -rw-r--r-- | source3/include/smb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index bb055214ec..acbd56d81e 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -1655,7 +1655,10 @@ 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) { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } +#define ZERO_STRUCTP(x) memset((char *)(x), 0, sizeof(*(x)) + +/* zero a structure given a pointer to the structure */ +#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 */ |