From e623c00ce9df3580e6eb1b0337fe1d9727fb61e6 Mon Sep 17 00:00:00 2001
From: Alexandra Ellwood <lxs@mit.edu>
Date: Wed, 25 Jul 2007 19:29:39 +0000
Subject: Added callback support for wait_for_change functions

ticket: 4644
status: open

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19731 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ccapi/common/cci_array_internal.c | 4 +---
 src/ccapi/common/cci_identifier.c     | 6 ++----
 src/ccapi/common/cci_stream.c         | 4 +---
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/ccapi/common')

diff --git a/src/ccapi/common/cci_array_internal.c b/src/ccapi/common/cci_array_internal.c
index 85578c2b1..3d1e35ef3 100644
--- a/src/ccapi/common/cci_array_internal.c
+++ b/src/ccapi/common/cci_array_internal.c
@@ -128,9 +128,7 @@ cc_int32 cci_array_release (cci_array_t io_array)
 {
     cc_int32 err = ccNoError;
     
-    if (!io_array) { err = ccErrBadParam; }
-    
-    if (!err) {
+    if (!err && io_array) {
         cc_uint64 i;
         
         if (io_array->object_release) {
diff --git a/src/ccapi/common/cci_identifier.c b/src/ccapi/common/cci_identifier.c
index 8695d2171..b6e918892 100644
--- a/src/ccapi/common/cci_identifier.c
+++ b/src/ccapi/common/cci_identifier.c
@@ -141,16 +141,14 @@ cc_int32 cci_identifier_release (cci_identifier_t in_identifier)
 {
     cc_int32 err = ccNoError;
     
-    if (!in_identifier) { err = ccErrBadParam; }
-    
     /* Do not free the static "uninitialized" identifier */
-    if (!err && in_identifier != cci_identifier_uninitialized) {
+    if (!err && in_identifier && in_identifier != cci_identifier_uninitialized) {
         free (in_identifier->server_id);
         free (in_identifier->object_id);
         free (in_identifier);
     }
     
-    return err;
+    return cci_check_error (err);
 }
 
 #pragma mark -
diff --git a/src/ccapi/common/cci_stream.c b/src/ccapi/common/cci_stream.c
index 1532f1ed8..b19e7bbfb 100644
--- a/src/ccapi/common/cci_stream.c
+++ b/src/ccapi/common/cci_stream.c
@@ -134,9 +134,7 @@ cc_uint32 cci_stream_release (cci_stream_t io_stream)
 {	
     cc_int32 err = ccNoError;
     
-    if (!io_stream) { err = ccErrBadParam; }
-    
-    if (!err) {
+    if (!err && io_stream) {
         free (io_stream->data);
         free (io_stream);
     }
-- 
cgit