diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 21:23:17 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2008-09-30 21:23:17 +0000 |
| commit | 89db2820d03f280d0bf0e217d520e89c2bb8acd2 (patch) | |
| tree | baf4c5e5930974bf928509aea9d511d947b623f2 /src/ccapi/lib/ccapi_ipc.c | |
| parent | 6b6d24e1ae0aadffb9062ac94ae8e600e09dbef0 (diff) | |
| download | krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.tar.gz krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.tar.xz krb5-89db2820d03f280d0bf0e217d520e89c2bb8acd2.zip | |
CCAPI should use common ipc and stream code
KIM and CCAPI should share the same IPC and stream object types.
Modified CCAPI to use code in src/util (stream) and src/util/mac (ipc)
ticket: new
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20787 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/lib/ccapi_ipc.c')
| -rw-r--r-- | src/ccapi/lib/ccapi_ipc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/ccapi/lib/ccapi_ipc.c b/src/ccapi/lib/ccapi_ipc.c index fe541db4eb..43993dc76d 100644 --- a/src/ccapi/lib/ccapi_ipc.c +++ b/src/ccapi/lib/ccapi_ipc.c @@ -46,12 +46,12 @@ void cci_ipc_thread_fini (void) static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, cc_int32 in_launch_server, cci_identifier_t in_identifier, - cci_stream_t in_request_data, - cci_stream_t *out_reply_data) + k5_ipc_stream in_request_data, + k5_ipc_stream *out_reply_data) { cc_int32 err = ccNoError; - cci_stream_t request = NULL; - cci_stream_t reply = NULL; + k5_ipc_stream request = NULL; + k5_ipc_stream reply = NULL; cc_int32 reply_error = 0; if (!in_identifier) { err = cci_check_error (ccErrBadParam); } @@ -65,15 +65,15 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, } if (!err && in_request_data) { - err = cci_stream_write (request, - cci_stream_data (in_request_data), - cci_stream_size (in_request_data)); + err = k5_ipc_stream_write (request, + k5_ipc_stream_data (in_request_data), + k5_ipc_stream_size (in_request_data)); } if (!err) { err = cci_os_ipc (in_launch_server, request, &reply); - if (!err && cci_stream_size (reply) > 0) { + if (!err && k5_ipc_stream_size (reply) > 0) { err = cci_message_read_reply_header (reply, &reply_error); } } @@ -87,8 +87,8 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, reply = NULL; /* take ownership */ } - cci_stream_release (request); - cci_stream_release (reply); + k5_ipc_stream_release (request); + k5_ipc_stream_release (reply); return cci_check_error (err); } @@ -97,8 +97,8 @@ static cc_int32 _cci_ipc_send (enum cci_msg_id_t in_request_name, cc_int32 cci_ipc_send (enum cci_msg_id_t in_request_name, cci_identifier_t in_identifier, - cci_stream_t in_request_data, - cci_stream_t *out_reply_data) + k5_ipc_stream in_request_data, + k5_ipc_stream *out_reply_data) { return cci_check_error (_cci_ipc_send (in_request_name, 1, in_identifier, @@ -110,8 +110,8 @@ cc_int32 cci_ipc_send (enum cci_msg_id_t in_request_name, cc_int32 cci_ipc_send_no_launch (enum cci_msg_id_t in_request_name, cci_identifier_t in_identifier, - cci_stream_t in_request_data, - cci_stream_t *out_reply_data) + k5_ipc_stream in_request_data, + k5_ipc_stream *out_reply_data) { return cci_check_error (_cci_ipc_send (in_request_name, 0, in_identifier, |