From 91984b0098d0452c3eed9c035357decad477a2ba Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Thu, 7 Jun 2007 21:50:39 +0000 Subject: Removed cross-compilation uses of inline because they don't do anything on our compilers and were interfering with the Windows builds. If we need to we can revisit this later with an actual profiling tool. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19571 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ccapi/common/cci_os_debugging.h | 2 +- src/ccapi/common/cci_os_identifier.h | 2 +- src/ccapi/common/cci_stream.c | 4 +- src/ccapi/common/cci_stream.h | 4 +- src/ccapi/common/mac/cci_os_debugging.c | 2 +- src/ccapi/common/mac/cci_os_identifier.c | 2 +- src/ccapi/lib/ccapi_os_ipc.h | 2 +- src/ccapi/lib/mac/ccapi_os_ipc.c | 2 +- src/ccapi/server/ccs_array.c | 48 ++++++------- src/ccapi/server/ccs_array.h | 48 ++++++------- src/ccapi/server/ccs_cache_collection.c | 8 +-- src/ccapi/server/ccs_cache_collection.h | 8 +-- src/ccapi/server/ccs_ccache.c | 8 +-- src/ccapi/server/ccs_ccache.h | 4 +- src/ccapi/server/ccs_credentials.c | 8 +-- src/ccapi/server/ccs_credentials.h | 8 +-- src/ccapi/server/ccs_list.c | 118 +++++++++++++++---------------- src/ccapi/server/ccs_os_pipe.h | 12 ++-- src/ccapi/server/ccs_pipe.c | 2 +- src/ccapi/server/ccs_pipe.h | 2 +- src/ccapi/server/mac/ccs_os_pipe.c | 12 ++-- 21 files changed, 153 insertions(+), 153 deletions(-) (limited to 'src/ccapi') diff --git a/src/ccapi/common/cci_os_debugging.h b/src/ccapi/common/cci_os_debugging.h index b08ee002e..b2a74e129 100644 --- a/src/ccapi/common/cci_os_debugging.h +++ b/src/ccapi/common/cci_os_debugging.h @@ -30,6 +30,6 @@ #include "cci_types.h" #include -inline void cci_os_debug_vprintf (const char *in_format, va_list in_args); +void cci_os_debug_vprintf (const char *in_format, va_list in_args); #endif /* CCI_OS_DEBUGGING_H */ diff --git a/src/ccapi/common/cci_os_identifier.h b/src/ccapi/common/cci_os_identifier.h index b60772095..3112902f0 100644 --- a/src/ccapi/common/cci_os_identifier.h +++ b/src/ccapi/common/cci_os_identifier.h @@ -29,6 +29,6 @@ #include "cci_types.h" -inline cc_int32 cci_os_identifier_new_uuid (cci_uuid_string_t *out_uuid_string); +cc_int32 cci_os_identifier_new_uuid (cci_uuid_string_t *out_uuid_string); #endif /* CCI_OS_IDENTIFIER_H */ diff --git a/src/ccapi/common/cci_stream.c b/src/ccapi/common/cci_stream.c index cac5431e7..1532f1ed8 100644 --- a/src/ccapi/common/cci_stream.c +++ b/src/ccapi/common/cci_stream.c @@ -146,7 +146,7 @@ cc_uint32 cci_stream_release (cci_stream_t io_stream) /* ------------------------------------------------------------------------ */ -inline cc_uint64 cci_stream_size (cci_stream_t in_stream) +cc_uint64 cci_stream_size (cci_stream_t in_stream) { return in_stream ? in_stream->size : 0; } @@ -154,7 +154,7 @@ inline cc_uint64 cci_stream_size (cci_stream_t in_stream) /* ------------------------------------------------------------------------ */ -inline const char *cci_stream_data (cci_stream_t in_stream) +const char *cci_stream_data (cci_stream_t in_stream) { return in_stream ? in_stream->data : NULL; } diff --git a/src/ccapi/common/cci_stream.h b/src/ccapi/common/cci_stream.h index 9c37361cd..76df2c846 100644 --- a/src/ccapi/common/cci_stream.h +++ b/src/ccapi/common/cci_stream.h @@ -33,9 +33,9 @@ cc_int32 cci_stream_new (cci_stream_t *out_stream); cc_uint32 cci_stream_release (cci_stream_t io_stream); -inline cc_uint64 cci_stream_size (cci_stream_t in_stream); +cc_uint64 cci_stream_size (cci_stream_t in_stream); -inline const char *cci_stream_data (cci_stream_t in_stream); +const char *cci_stream_data (cci_stream_t in_stream); cc_uint32 cci_stream_read (cci_stream_t in_stream, void *io_data, diff --git a/src/ccapi/common/mac/cci_os_debugging.c b/src/ccapi/common/mac/cci_os_debugging.c index f64b83916..02f06324c 100644 --- a/src/ccapi/common/mac/cci_os_debugging.c +++ b/src/ccapi/common/mac/cci_os_debugging.c @@ -30,7 +30,7 @@ /* ------------------------------------------------------------------------ */ -inline void cci_os_debug_vprintf (const char *in_format, va_list in_args) +void cci_os_debug_vprintf (const char *in_format, va_list in_args) { dvprintf (in_format, in_args); } diff --git a/src/ccapi/common/mac/cci_os_identifier.c b/src/ccapi/common/mac/cci_os_identifier.c index c01e727bb..5f3d0651a 100644 --- a/src/ccapi/common/mac/cci_os_identifier.c +++ b/src/ccapi/common/mac/cci_os_identifier.c @@ -31,7 +31,7 @@ /* ------------------------------------------------------------------------ */ -inline cc_int32 cci_os_identifier_new_uuid (cci_uuid_string_t *out_uuid_string) +cc_int32 cci_os_identifier_new_uuid (cci_uuid_string_t *out_uuid_string) { cc_int32 err = ccNoError; cci_uuid_string_t uuid_string = NULL; diff --git a/src/ccapi/lib/ccapi_os_ipc.h b/src/ccapi/lib/ccapi_os_ipc.h index 8cce06c60..d9eb79f1c 100644 --- a/src/ccapi/lib/ccapi_os_ipc.h +++ b/src/ccapi/lib/ccapi_os_ipc.h @@ -29,7 +29,7 @@ #include "cci_common.h" -inline cc_int32 cci_os_ipc_thread_init (void); +cc_int32 cci_os_ipc_thread_init (void); cc_int32 cci_os_ipc (cc_int32 in_launch_server, cci_stream_t in_request_stream, diff --git a/src/ccapi/lib/mac/ccapi_os_ipc.c b/src/ccapi/lib/mac/ccapi_os_ipc.c index ea3b548f8..95a2f0b1b 100644 --- a/src/ccapi/lib/mac/ccapi_os_ipc.c +++ b/src/ccapi/lib/mac/ccapi_os_ipc.c @@ -40,7 +40,7 @@ static pthread_key_t g_server_died_key = 0; /* ------------------------------------------------------------------------ */ -inline cc_int32 cci_os_ipc_thread_init (void) +cc_int32 cci_os_ipc_thread_init (void) { cc_int32 err = ccNoError; diff --git a/src/ccapi/server/ccs_array.c b/src/ccapi/server/ccs_array.c index c798c7a3a..682693341 100644 --- a/src/ccapi/server/ccs_array.c +++ b/src/ccapi/server/ccs_array.c @@ -36,46 +36,46 @@ static cc_int32 ccs_pipe_object_release (void *io_pipe) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_pipe_array_new (ccs_pipe_array_t *out_array) +cc_int32 ccs_pipe_array_new (ccs_pipe_array_t *out_array) { return cci_array_new (out_array, ccs_pipe_object_release); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_pipe_array_release (ccs_pipe_array_t io_array) +cc_int32 ccs_pipe_array_release (ccs_pipe_array_t io_array) { return cci_array_release (io_array); } /* ------------------------------------------------------------------------ */ -inline cc_uint64 ccs_pipe_array_count (ccs_pipe_array_t in_array) +cc_uint64 ccs_pipe_array_count (ccs_pipe_array_t in_array) { return cci_array_count (in_array); } /* ------------------------------------------------------------------------ */ -inline ccs_pipe_t ccs_pipe_array_object_at_index (ccs_pipe_array_t io_array, - cc_uint64 in_position) +ccs_pipe_t ccs_pipe_array_object_at_index (ccs_pipe_array_t io_array, + cc_uint64 in_position) { return cci_array_object_at_index (io_array, in_position); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_pipe_array_insert (ccs_pipe_array_t io_array, - ccs_pipe_t in_pipe, - cc_uint64 in_position) +cc_int32 ccs_pipe_array_insert (ccs_pipe_array_t io_array, + ccs_pipe_t in_pipe, + cc_uint64 in_position) { return cci_array_insert (io_array, in_pipe, in_position); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_pipe_array_remove (ccs_pipe_array_t io_array, - cc_uint64 in_position) +cc_int32 ccs_pipe_array_remove (ccs_pipe_array_t io_array, + cc_uint64 in_position) { return cci_array_remove (io_array, in_position); } @@ -91,55 +91,55 @@ static cc_int32 ccs_lock_object_release (void *io_lock) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_lock_array_new (ccs_lock_array_t *out_array) +cc_int32 ccs_lock_array_new (ccs_lock_array_t *out_array) { return cci_array_new (out_array, ccs_lock_object_release); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_lock_array_release (ccs_lock_array_t io_array) +cc_int32 ccs_lock_array_release (ccs_lock_array_t io_array) { return cci_array_release (io_array); } /* ------------------------------------------------------------------------ */ -inline cc_uint64 ccs_lock_array_count (ccs_lock_array_t in_array) +cc_uint64 ccs_lock_array_count (ccs_lock_array_t in_array) { return cci_array_count (in_array); } /* ------------------------------------------------------------------------ */ -inline ccs_lock_t ccs_lock_array_object_at_index (ccs_lock_array_t io_array, - cc_uint64 in_position) +ccs_lock_t ccs_lock_array_object_at_index (ccs_lock_array_t io_array, + cc_uint64 in_position) { return cci_array_object_at_index (io_array, in_position); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_lock_array_insert (ccs_lock_array_t io_array, - ccs_lock_t in_lock, - cc_uint64 in_position) +cc_int32 ccs_lock_array_insert (ccs_lock_array_t io_array, + ccs_lock_t in_lock, + cc_uint64 in_position) { return cci_array_insert (io_array, in_lock, in_position); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_lock_array_remove (ccs_lock_array_t io_array, - cc_uint64 in_position) +cc_int32 ccs_lock_array_remove (ccs_lock_array_t io_array, + cc_uint64 in_position) { return cci_array_remove (io_array, in_position); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, - cc_uint64 in_position, - cc_uint64 in_new_position, - cc_uint64 *out_real_new_position) +cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, + cc_uint64 in_position, + cc_uint64 in_new_position, + cc_uint64 *out_real_new_position) { return cci_array_move (io_array, in_position, in_new_position, out_real_new_position); } diff --git a/src/ccapi/server/ccs_array.h b/src/ccapi/server/ccs_array.h index 865647c1c..6f896cb60 100644 --- a/src/ccapi/server/ccs_array.h +++ b/src/ccapi/server/ccs_array.h @@ -29,43 +29,43 @@ #include "ccs_types.h" -inline cc_int32 ccs_pipe_array_new (ccs_pipe_array_t *out_array); +cc_int32 ccs_pipe_array_new (ccs_pipe_array_t *out_array); -inline cc_int32 ccs_pipe_array_release (ccs_pipe_array_t io_array); +cc_int32 ccs_pipe_array_release (ccs_pipe_array_t io_array); -inline cc_uint64 ccs_pipe_array_count (ccs_pipe_array_t in_array); +cc_uint64 ccs_pipe_array_count (ccs_pipe_array_t in_array); -inline ccs_pipe_t ccs_pipe_array_object_at_index (ccs_pipe_array_t io_array, - cc_uint64 in_position); +ccs_pipe_t ccs_pipe_array_object_at_index (ccs_pipe_array_t io_array, + cc_uint64 in_position); -inline cc_int32 ccs_pipe_array_insert (ccs_pipe_array_t io_array, - ccs_pipe_t in_pipe, - cc_uint64 in_position); +cc_int32 ccs_pipe_array_insert (ccs_pipe_array_t io_array, + ccs_pipe_t in_pipe, + cc_uint64 in_position); -inline cc_int32 ccs_pipe_array_remove (ccs_pipe_array_t io_array, - cc_uint64 in_position); +cc_int32 ccs_pipe_array_remove (ccs_pipe_array_t io_array, + cc_uint64 in_position); #pragma mark - -inline cc_int32 ccs_lock_array_new (ccs_lock_array_t *out_array); +cc_int32 ccs_lock_array_new (ccs_lock_array_t *out_array); -inline cc_int32 ccs_lock_array_release (ccs_lock_array_t io_array); +cc_int32 ccs_lock_array_release (ccs_lock_array_t io_array); -inline cc_uint64 ccs_lock_array_count (ccs_lock_array_t in_array); +cc_uint64 ccs_lock_array_count (ccs_lock_array_t in_array); -inline ccs_lock_t ccs_lock_array_object_at_index (ccs_lock_array_t io_array, - cc_uint64 in_position); +ccs_lock_t ccs_lock_array_object_at_index (ccs_lock_array_t io_array, + cc_uint64 in_position); -inline cc_int32 ccs_lock_array_insert (ccs_lock_array_t io_array, - ccs_lock_t in_lock, - cc_uint64 in_position); +cc_int32 ccs_lock_array_insert (ccs_lock_array_t io_array, + ccs_lock_t in_lock, + cc_uint64 in_position); -inline cc_int32 ccs_lock_array_remove (ccs_lock_array_t io_array, - cc_uint64 in_position); +cc_int32 ccs_lock_array_remove (ccs_lock_array_t io_array, + cc_uint64 in_position); -inline cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, - cc_uint64 in_position, - cc_uint64 in_new_position, - cc_uint64 *out_real_new_position); +cc_int32 ccs_lock_array_move (ccs_lock_array_t io_array, + cc_uint64 in_position, + cc_uint64 in_new_position, + cc_uint64 *out_real_new_position); #endif /* CCS_ARRAY_H */ diff --git a/src/ccapi/server/ccs_cache_collection.c b/src/ccapi/server/ccs_cache_collection.c index 44cf5a882..e3132744a 100644 --- a/src/ccapi/server/ccs_cache_collection.c +++ b/src/ccapi/server/ccs_cache_collection.c @@ -85,7 +85,7 @@ cc_int32 ccs_cache_collection_new (ccs_cache_collection_t *out_cache_collection) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_release (ccs_cache_collection_t io_cache_collection) +cc_int32 ccs_cache_collection_release (ccs_cache_collection_t io_cache_collection) { cc_int32 err = ccNoError; @@ -103,9 +103,9 @@ inline cc_int32 ccs_cache_collection_release (ccs_cache_collection_t io_cache_co /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_compare_identifier (ccs_cache_collection_t in_cache_collection, - cci_identifier_t in_identifier, - cc_uint32 *out_equal) +cc_int32 ccs_cache_collection_compare_identifier (ccs_cache_collection_t in_cache_collection, + cci_identifier_t in_identifier, + cc_uint32 *out_equal) { cc_int32 err = ccNoError; diff --git a/src/ccapi/server/ccs_cache_collection.h b/src/ccapi/server/ccs_cache_collection.h index 4d663f992..b3278f7db 100644 --- a/src/ccapi/server/ccs_cache_collection.h +++ b/src/ccapi/server/ccs_cache_collection.h @@ -31,11 +31,11 @@ cc_int32 ccs_cache_collection_new (ccs_cache_collection_t *out_cache_collection); -inline cc_int32 ccs_cache_collection_release (ccs_cache_collection_t io_cache_collection); +cc_int32 ccs_cache_collection_release (ccs_cache_collection_t io_cache_collection); -inline cc_int32 ccs_cache_collection_compare_identifier (ccs_cache_collection_t in_cache_collection, - cci_identifier_t in_identifier, - cc_uint32 *out_equal); +cc_int32 ccs_cache_collection_compare_identifier (ccs_cache_collection_t in_cache_collection, + cci_identifier_t in_identifier, + cc_uint32 *out_equal); cc_int32 ccs_cache_collection_changed (ccs_cache_collection_t io_cache_collection); diff --git a/src/ccapi/server/ccs_ccache.c b/src/ccapi/server/ccs_ccache.c index dfe668633..cafb2bf95 100644 --- a/src/ccapi/server/ccs_ccache.c +++ b/src/ccapi/server/ccs_ccache.c @@ -206,7 +206,7 @@ cc_int32 ccs_ccache_swap_contents (ccs_ccache_t io_source_ccache, /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache) +cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache) { cc_int32 err = ccNoError; @@ -228,9 +228,9 @@ inline cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_compare_identifier (ccs_ccache_t in_ccache, - cci_identifier_t in_identifier, - cc_uint32 *out_equal) +cc_int32 ccs_ccache_compare_identifier (ccs_ccache_t in_ccache, + cci_identifier_t in_identifier, + cc_uint32 *out_equal) { cc_int32 err = ccNoError; diff --git a/src/ccapi/server/ccs_ccache.h b/src/ccapi/server/ccs_ccache.h index 837c6b457..ea1b03c07 100644 --- a/src/ccapi/server/ccs_ccache.h +++ b/src/ccapi/server/ccs_ccache.h @@ -42,9 +42,9 @@ cc_int32 ccs_ccache_reset (ccs_ccache_t io_ccache, cc_int32 ccs_ccache_swap_contents (ccs_ccache_t io_source_ccache, ccs_ccache_t io_destination_ccache); -inline cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache); +cc_int32 ccs_ccache_release (ccs_ccache_t io_ccache); -inline cc_int32 ccs_ccache_compare_identifier (ccs_ccache_t in_ccache, +cc_int32 ccs_ccache_compare_identifier (ccs_ccache_t in_ccache, cci_identifier_t in_identifier, cc_uint32 *out_equal); diff --git a/src/ccapi/server/ccs_credentials.c b/src/ccapi/server/ccs_credentials.c index 7cb6483f0..a5bc70c9a 100644 --- a/src/ccapi/server/ccs_credentials.c +++ b/src/ccapi/server/ccs_credentials.c @@ -78,7 +78,7 @@ cc_int32 ccs_credentials_new (ccs_credentials_t *out_credentials, /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_release (ccs_credentials_t io_credentials) +cc_int32 ccs_credentials_release (ccs_credentials_t io_credentials) { cc_int32 err = ccNoError; @@ -116,9 +116,9 @@ cc_int32 ccs_credentials_write (ccs_credentials_t in_credentials, /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_compare_identifier (ccs_credentials_t in_credentials, - cci_identifier_t in_identifier, - cc_uint32 *out_equal) +cc_int32 ccs_credentials_compare_identifier (ccs_credentials_t in_credentials, + cci_identifier_t in_identifier, + cc_uint32 *out_equal) { cc_int32 err = ccNoError; diff --git a/src/ccapi/server/ccs_credentials.h b/src/ccapi/server/ccs_credentials.h index e4dbb69f5..e0a08fb9c 100644 --- a/src/ccapi/server/ccs_credentials.h +++ b/src/ccapi/server/ccs_credentials.h @@ -34,13 +34,13 @@ cc_int32 ccs_credentials_new (ccs_credentials_t *out_credentials, cci_stream_t in_stream, ccs_credentials_list_t io_credentials_list); -inline cc_int32 ccs_credentials_release (ccs_credentials_t io_credentials); +cc_int32 ccs_credentials_release (ccs_credentials_t io_credentials); cc_int32 ccs_credentials_write (ccs_credentials_t in_credentials, cci_stream_t io_stream); -inline cc_int32 ccs_credentials_compare_identifier (ccs_credentials_t in_credentials, - cci_identifier_t in_identifier, - cc_uint32 *out_equal); +cc_int32 ccs_credentials_compare_identifier (ccs_credentials_t in_credentials, + cci_identifier_t in_identifier, + cc_uint32 *out_equal); #endif /* CCS_CREDENTIALS_H */ diff --git a/src/ccapi/server/ccs_list.c b/src/ccapi/server/ccs_list.c index 17355c08f..a8f7d96d6 100644 --- a/src/ccapi/server/ccs_list.c +++ b/src/ccapi/server/ccs_list.c @@ -47,7 +47,7 @@ static cc_int32 ccs_cache_collection_list_object_compare_identifier (void /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_new (ccs_cache_collection_list_t *out_list) +cc_int32 ccs_cache_collection_list_new (ccs_cache_collection_list_t *out_list) { return ccs_list_new (out_list, ccErrInvalidContext, @@ -58,40 +58,40 @@ inline cc_int32 ccs_cache_collection_list_new (ccs_cache_collection_list_t *out_ /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_count (ccs_cache_collection_list_t in_list, - cc_uint64 *out_count) +cc_int32 ccs_cache_collection_list_count (ccs_cache_collection_list_t in_list, + cc_uint64 *out_count) { return ccs_list_count (in_list, out_count); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_find (ccs_cache_collection_list_t in_list, - cci_identifier_t in_identifier, - ccs_cache_collection_t *out_cache_collection) +cc_int32 ccs_cache_collection_list_find (ccs_cache_collection_list_t in_list, + cci_identifier_t in_identifier, + ccs_cache_collection_t *out_cache_collection) { return ccs_list_find (in_list, in_identifier, (ccs_object_t *) out_cache_collection); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_add (ccs_cache_collection_list_t io_list, - ccs_cache_collection_t in_cache_collection) +cc_int32 ccs_cache_collection_list_add (ccs_cache_collection_list_t io_list, + ccs_cache_collection_t in_cache_collection) { return ccs_list_add (io_list, in_cache_collection); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_remove (ccs_cache_collection_list_t io_list, - cci_identifier_t in_identifier) +cc_int32 ccs_cache_collection_list_remove (ccs_cache_collection_list_t io_list, + cci_identifier_t in_identifier) { return ccs_list_remove (io_list, in_identifier); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_cache_collection_list_release (ccs_cache_collection_list_t io_list) +cc_int32 ccs_cache_collection_list_release (ccs_cache_collection_list_t io_list) { return ccs_list_release (io_list); } @@ -118,7 +118,7 @@ static cc_int32 ccs_ccache_list_object_compare_identifier (void *in_ /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_new (ccs_ccache_list_t *out_list) +cc_int32 ccs_ccache_list_new (ccs_ccache_list_t *out_list) { return ccs_list_new (out_list, ccErrInvalidCCache, @@ -129,34 +129,34 @@ inline cc_int32 ccs_ccache_list_new (ccs_ccache_list_t *out_list) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_new_iterator (ccs_ccache_list_t in_list, - ccs_ccache_list_iterator_t *out_list_iterator) +cc_int32 ccs_ccache_list_new_iterator (ccs_ccache_list_t in_list, + ccs_ccache_list_iterator_t *out_list_iterator) { return ccs_list_new_iterator (in_list, out_list_iterator); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_count (ccs_ccache_list_t in_list, - cc_uint64 *out_count) +cc_int32 ccs_ccache_list_count (ccs_ccache_list_t in_list, + cc_uint64 *out_count) { return ccs_list_count (in_list, out_count); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_find (ccs_ccache_list_t in_list, - cci_identifier_t in_identifier, - ccs_ccache_t *out_ccache) +cc_int32 ccs_ccache_list_find (ccs_ccache_list_t in_list, + cci_identifier_t in_identifier, + ccs_ccache_t *out_ccache) { return ccs_list_find (in_list, in_identifier, (ccs_object_t *) out_ccache); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_find_iterator (ccs_ccache_list_t in_list, - cci_identifier_t in_identifier, - ccs_ccache_list_iterator_t *out_list_iterator) +cc_int32 ccs_ccache_list_find_iterator (ccs_ccache_list_t in_list, + cci_identifier_t in_identifier, + ccs_ccache_list_iterator_t *out_list_iterator) { return ccs_list_find_iterator (in_list, in_identifier, (ccs_list_iterator_t *) out_list_iterator); @@ -164,62 +164,62 @@ inline cc_int32 ccs_ccache_list_find_iterator (ccs_ccache_list_t in_li /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_add (ccs_ccache_list_t io_list, - ccs_ccache_t in_ccache) +cc_int32 ccs_ccache_list_add (ccs_ccache_list_t io_list, + ccs_ccache_t in_ccache) { return ccs_list_add (io_list, in_ccache); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_remove (ccs_ccache_list_t io_list, - cci_identifier_t in_identifier) +cc_int32 ccs_ccache_list_remove (ccs_ccache_list_t io_list, + cci_identifier_t in_identifier) { return ccs_list_remove (io_list, in_identifier); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_push_front (ccs_ccache_list_t io_list, - cci_identifier_t in_identifier) +cc_int32 ccs_ccache_list_push_front (ccs_ccache_list_t io_list, + cci_identifier_t in_identifier) { return ccs_list_push_front (io_list, in_identifier); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_release (ccs_ccache_list_t io_list) +cc_int32 ccs_ccache_list_release (ccs_ccache_list_t io_list) { return ccs_list_release (io_list); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_iterator_write (ccs_ccache_list_iterator_t in_list_iterator, - cci_stream_t in_stream) +cc_int32 ccs_ccache_list_iterator_write (ccs_ccache_list_iterator_t in_list_iterator, + cci_stream_t in_stream) { return ccs_list_iterator_write (in_list_iterator, in_stream); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_iterator_clone (ccs_ccache_list_iterator_t in_list_iterator, - ccs_ccache_list_iterator_t *out_list_iterator) +cc_int32 ccs_ccache_list_iterator_clone (ccs_ccache_list_iterator_t in_list_iterator, + ccs_ccache_list_iterator_t *out_list_iterator) { return ccs_list_iterator_clone (in_list_iterator, out_list_iterator); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_iterator_next (ccs_ccache_list_iterator_t io_list_iterator, - ccs_ccache_t *out_ccache) +cc_int32 ccs_ccache_list_iterator_next (ccs_ccache_list_iterator_t io_list_iterator, + ccs_ccache_t *out_ccache) { return ccs_list_iterator_next (io_list_iterator, (ccs_object_t *) out_ccache); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_ccache_list_iterator_release (ccs_ccache_list_iterator_t io_list_iterator) +cc_int32 ccs_ccache_list_iterator_release (ccs_ccache_list_iterator_t io_list_iterator) { return ccs_list_iterator_release (io_list_iterator); } @@ -246,7 +246,7 @@ static cc_int32 ccs_credentials_list_object_compare_identifier (void /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_new (ccs_credentials_list_t *out_list) +cc_int32 ccs_credentials_list_new (ccs_credentials_list_t *out_list) { return ccs_list_new (out_list, ccErrInvalidCredentials, @@ -257,34 +257,34 @@ inline cc_int32 ccs_credentials_list_new (ccs_credentials_list_t *out_list) /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_new_iterator (ccs_credentials_list_t in_list, - ccs_credentials_list_iterator_t *out_list_iterator) +cc_int32 ccs_credentials_list_new_iterator (ccs_credentials_list_t in_list, + ccs_credentials_list_iterator_t *out_list_iterator) { return ccs_list_new_iterator (in_list, out_list_iterator); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_count (ccs_credentials_list_t in_list, - cc_uint64 *out_count) +cc_int32 ccs_credentials_list_count (ccs_credentials_list_t in_list, + cc_uint64 *out_count) { return ccs_list_count (in_list, out_count); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_find (ccs_credentials_list_t in_list, - cci_identifier_t in_identifier, - ccs_credentials_t *out_credentials) +cc_int32 ccs_credentials_list_find (ccs_credentials_list_t in_list, + cci_identifier_t in_identifier, + ccs_credentials_t *out_credentials) { return ccs_list_find (in_list, in_identifier, (ccs_object_t *) out_credentials); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_find_iterator (ccs_credentials_list_t in_list, - cci_identifier_t in_identifier, - ccs_credentials_list_iterator_t *out_list_iterator) +cc_int32 ccs_credentials_list_find_iterator (ccs_credentials_list_t in_list, + cci_identifier_t in_identifier, + ccs_credentials_list_iterator_t *out_list_iterator) { return ccs_list_find_iterator (in_list, in_identifier, (ccs_list_iterator_t *) out_list_iterator); @@ -292,54 +292,54 @@ inline cc_int32 ccs_credentials_list_find_iterator (ccs_credentials_list_t /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_add (ccs_credentials_list_t io_list, - ccs_credentials_t in_credential) +cc_int32 ccs_credentials_list_add (ccs_credentials_list_t io_list, + ccs_credentials_t in_credential) { return ccs_list_add (io_list, in_credential); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_remove (ccs_credentials_list_t io_list, - cci_identifier_t in_identifier) +cc_int32 ccs_credentials_list_remove (ccs_credentials_list_t io_list, + cci_identifier_t in_identifier) { return ccs_list_remove (io_list, in_identifier); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_release (ccs_credentials_list_t io_list) +cc_int32 ccs_credentials_list_release (ccs_credentials_list_t io_list) { return ccs_list_release (io_list); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_iterator_write (ccs_credentials_list_iterator_t in_list_iterator, - cci_stream_t in_stream) +cc_int32 ccs_credentials_list_iterator_write (ccs_credentials_list_iterator_t in_list_iterator, + cci_stream_t in_stream) { return ccs_list_iterator_write (in_list_iterator, in_stream); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_iterator_clone (ccs_credentials_list_iterator_t in_list_iterator, - ccs_credentials_list_iterator_t *out_list_iterator) +cc_int32 ccs_credentials_list_iterator_clone (ccs_credentials_list_iterator_t in_list_iterator, + ccs_credentials_list_iterator_t *out_list_iterator) { return ccs_list_iterator_clone (in_list_iterator, out_list_iterator); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_iterator_next (ccs_credentials_list_iterator_t io_list_iterator, - ccs_credentials_t *out_credential) +cc_int32 ccs_credentials_list_iterator_next (ccs_credentials_list_iterator_t io_list_iterator, + ccs_credentials_t *out_credential) { return ccs_list_iterator_next (io_list_iterator, (ccs_object_t *) out_credential); } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_credentials_list_iterator_release (ccs_credentials_list_iterator_t io_list_iterator) +cc_int32 ccs_credentials_list_iterator_release (ccs_credentials_list_iterator_t io_list_iterator) { return ccs_list_iterator_release (io_list_iterator); } diff --git a/src/ccapi/server/ccs_os_pipe.h b/src/ccapi/server/ccs_os_pipe.h index 57fe64b99..049ce22fe 100644 --- a/src/ccapi/server/ccs_os_pipe.h +++ b/src/ccapi/server/ccs_os_pipe.h @@ -29,14 +29,14 @@ #include "ccs_types.h" -inline cc_int32 ccs_os_pipe_copy (ccs_os_pipe_t *out_pipe, - ccs_os_pipe_t in_pipe); +cc_int32 ccs_os_pipe_copy (ccs_os_pipe_t *out_pipe, + ccs_os_pipe_t in_pipe); -inline cc_int32 ccs_os_pipe_release (ccs_os_pipe_t io_pipe); +cc_int32 ccs_os_pipe_release (ccs_os_pipe_t io_pipe); -inline cc_int32 ccs_os_pipe_compare (ccs_os_pipe_t in_pipe, - ccs_os_pipe_t in_compare_to_pipe, - cc_uint32 *out_equal); +cc_int32 ccs_os_pipe_compare (ccs_os_pipe_t in_pipe, + ccs_os_pipe_t in_compare_to_pipe, + cc_uint32 *out_equal); cc_int32 ccs_os_pipe_valid (ccs_os_pipe_t in_pipe); diff --git a/src/ccapi/server/ccs_pipe.c b/src/ccapi/server/ccs_pipe.c index d7521b57f..2b33f92a0 100644 --- a/src/ccapi/server/ccs_pipe.c +++ b/src/ccapi/server/ccs_pipe.c @@ -68,7 +68,7 @@ cc_int32 ccs_pipe_new (ccs_pipe_t *out_pipe, /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_pipe_release (ccs_pipe_t io_pipe) +cc_int32 ccs_pipe_release (ccs_pipe_t io_pipe) { cc_int32 err = ccNoError; diff --git a/src/ccapi/server/ccs_pipe.h b/src/ccapi/server/ccs_pipe.h index 7f3c0d40d..3f736fc01 100644 --- a/src/ccapi/server/ccs_pipe.h +++ b/src/ccapi/server/ccs_pipe.h @@ -35,7 +35,7 @@ cc_int32 ccs_pipe_new (ccs_pipe_t *out_pipe, cc_int32 ccs_pipe_copy (ccs_pipe_t *out_pipe, ccs_pipe_t in_pipe); -inline cc_int32 ccs_pipe_release (ccs_pipe_t io_pipe); +cc_int32 ccs_pipe_release (ccs_pipe_t io_pipe); cc_int32 ccs_pipe_compare (ccs_pipe_t in_pipe, ccs_pipe_t in_compare_to_pipe, diff --git a/src/ccapi/server/mac/ccs_os_pipe.c b/src/ccapi/server/mac/ccs_os_pipe.c index c3e7542a6..d22ffe353 100644 --- a/src/ccapi/server/mac/ccs_os_pipe.c +++ b/src/ccapi/server/mac/ccs_os_pipe.c @@ -32,8 +32,8 @@ /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_os_pipe_copy (ccs_os_pipe_t *out_pipe, - ccs_os_pipe_t in_pipe) +cc_int32 ccs_os_pipe_copy (ccs_os_pipe_t *out_pipe, + ccs_os_pipe_t in_pipe) { cc_int32 err = ccNoError; @@ -48,16 +48,16 @@ inline cc_int32 ccs_os_pipe_copy (ccs_os_pipe_t *out_pipe, /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_os_pipe_release (ccs_os_pipe_t io_pipe) +cc_int32 ccs_os_pipe_release (ccs_os_pipe_t io_pipe) { return ccNoError; } /* ------------------------------------------------------------------------ */ -inline cc_int32 ccs_os_pipe_compare (ccs_os_pipe_t in_pipe, - ccs_os_pipe_t in_compare_to_pipe, - cc_uint32 *out_equal) +cc_int32 ccs_os_pipe_compare (ccs_os_pipe_t in_pipe, + ccs_os_pipe_t in_compare_to_pipe, + cc_uint32 *out_equal) { cc_int32 err = ccNoError; -- cgit