svn commit: samba r23759 - in branches: SAMBA_3_0/source/locking
SAMBA_3_0_26/source/locking
vlendec at samba.org
vlendec at samba.org
Mon Jul 9 08:45:15 GMT 2007
Author: vlendec
Date: 2007-07-09 08:45:14 +0000 (Mon, 09 Jul 2007)
New Revision: 23759
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23759
Log:
Fix make test -- sorry
Modified:
branches/SAMBA_3_0/source/locking/brlock.c
branches/SAMBA_3_0_26/source/locking/brlock.c
Changeset:
Modified: branches/SAMBA_3_0/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 08:04:43 UTC (rev 23758)
+++ branches/SAMBA_3_0/source/locking/brlock.c 2007-07-09 08:45:14 UTC (rev 23759)
@@ -1642,8 +1642,8 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
- if (!(br_lck->lock_data = SMB_MALLOC_ARRAY(
- struct lock_struct, br_lck->num_locks))) {
+ br_lck->lock_data = SMB_MALLOC_ARRAY(struct lock_struct, br_lck->num_locks);
+ if ((br_lck->num_locks != 0) && (br_lck->lock_data == NULL)) {
DEBUG(0, ("malloc failed\n"));
TALLOC_FREE(br_lck);
return NULL;
Modified: branches/SAMBA_3_0_26/source/locking/brlock.c
===================================================================
--- branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 08:04:43 UTC (rev 23758)
+++ branches/SAMBA_3_0_26/source/locking/brlock.c 2007-07-09 08:45:14 UTC (rev 23759)
@@ -1642,8 +1642,8 @@
talloc_set_destructor(br_lck, byte_range_lock_destructor);
br_lck->num_locks = data.dsize / sizeof(struct lock_struct);
- if (!(br_lck->lock_data = SMB_MALLOC_ARRAY(
- struct lock_struct, br_lck->num_locks))) {
+ br_lck->lock_data = SMB_MALLOC_ARRAY(struct lock_struct, br_lck->num_locks);
+ if ((br_lck->num_locks != 0) && (br_lck->lock_data == NULL)) {
DEBUG(0, ("malloc failed\n"));
TALLOC_FREE(br_lck);
return NULL;
More information about the samba-cvs
mailing list