From 89db2820d03f280d0bf0e217d520e89c2bb8acd2 Mon Sep 17 00:00:00 2001 From: Alexandra Ellwood Date: Tue, 30 Sep 2008 21:23:17 +0000 Subject: 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 --- src/ccapi/server/win/WorkItem.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/ccapi/server/win/WorkItem.cpp') diff --git a/src/ccapi/server/win/WorkItem.cpp b/src/ccapi/server/win/WorkItem.cpp index 7e6aeb1cb..2e9ebcc93 100644 --- a/src/ccapi/server/win/WorkItem.cpp +++ b/src/ccapi/server/win/WorkItem.cpp @@ -47,28 +47,28 @@ void deleteBuffer(char** buf) { // WorkItem contains a CountedBuffer which must be deleted, // so each WorkItem must be deleted. -WorkItem::WorkItem(cci_stream_t buf, WIN_PIPE* pipe, const long type, const long sst) +WorkItem::WorkItem(k5_ipc_stream buf, WIN_PIPE* pipe, const long type, const long sst) : _buf(buf), _rpcmsg(type), _pipe(pipe), _sst(sst) { } WorkItem::WorkItem(const WorkItem& item) : _buf(NULL), _rpcmsg(0), _pipe(NULL), _sst(0) { - cci_stream_t _buf = NULL; - cci_stream_new(&_buf); - cci_stream_write(_buf, - cci_stream_data(item.payload()), - cci_stream_size(item.payload()) ); + k5_ipc_stream _buf = NULL; + k5_ipc_stream_new(&_buf); + k5_ipc_stream_write(_buf, + k5_ipc_stream_data(item.payload()), + k5_ipc_stream_size(item.payload()) ); WorkItem(_buf, item._pipe, item._rpcmsg, item._sst); } WorkItem::WorkItem() : _buf(NULL), _rpcmsg(CCMSG_INVALID), _pipe(NULL), _sst(0) { } WorkItem::~WorkItem() { - if (_buf) cci_stream_release(_buf); + if (_buf) k5_ipc_stream_release(_buf); if (_pipe) ccs_win_pipe_release(_pipe); } -const cci_stream_t WorkItem::take_payload() { - cci_stream_t temp = payload(); +const k5_ipc_stream WorkItem::take_payload() { + k5_ipc_stream temp = payload(); _buf = NULL; return temp; } -- cgit