Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / zn_malloc.c

diff --git a/servers/slapd/zn_malloc.c b/servers/slapd/zn_malloc.c
index 14d2113f9a59762e0e76bc1df701545cb0726238..7f8694763fb94b9130787712341ad46ba5cd9aa5 100644 (file)
--- a/servers/slapd/zn_malloc.c
+++ b/servers/slapd/zn_malloc.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$*/
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -13,15 +13,15 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Copyright 2004 IBM Corporation
+/* Portions Copyright 2004 IBM Corporation
  * All rights reserved.
- * Redisribution and use in source and binary forms, with or without
- * modification, are permitted only as  authorizd by the OpenLADP
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
  * Public License.
  */
 /* ACKNOWLEDGEMENTS
- * This work originally developed by Jong-Hyuk Choi
- * 2004/12/09   jongchoi@OpenLDAP.org
+ * This work originally developed by Jong-Hyuk Choi for inclusion in
+ * OpenLDAP Software.
  */
 
 #include "portable.h"
@@ -329,7 +329,7 @@ retry:
                if ( zh->zh_maxzones < zh->zh_numzones + zh->zh_deltazones ) {
                        ldap_pvt_thread_mutex_unlock( &zh->zh_mutex );
                        Debug( LDAP_DEBUG_TRACE,
-                               "slap_zn_malloc of %lu bytes failed, using ch_malloc\n",
+                               "zn_malloc %lu: ch_malloc\n",
                                (long)size, 0, 0);
                        Debug(LDAP_DEBUG_NONE,
                                "slap_zn_malloc: returning 0x%x, 0x%x\n",
@@ -542,7 +542,7 @@ slap_zn_free(void *ptr, void *ctx)
                                                Debug(LDAP_DEBUG_ANY, "slap_zn_free: "
                                                        "free object not found while bit is clear.\n",
                                                        0, 0, 0);
-                                               assert(zo);
+                                               assert(zo != NULL);
 
                                        }
                                } else {
@@ -604,7 +604,7 @@ slap_zn_free(void *ptr, void *ctx)
                                                Debug(LDAP_DEBUG_ANY, "slap_zn_free: "
                                                        "free object not found while bit is clear.\n",
                                                        0, 0, 0 );
-                                               assert( zo );
+                                               assert(zo != NULL);
 
                                        }
                                } else {