--- libaitrpc/src/lists.c 2012/11/13 09:21:27 1.11.2.1 +++ libaitrpc/src/lists.c 2013/05/30 09:22:02 1.14 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: lists.c,v 1.11.2.1 2012/11/13 09:21:27 misho Exp $ +* $Id: lists.c,v 1.14 2013/05/30 09:22:02 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -64,7 +64,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, u_sho return -1; } - if (!(func = io_malloc(sizeof(rpc_func_t)))) { + if (!(func = e_malloc(sizeof(rpc_func_t)))) { LOGERR; return -1; } else { @@ -74,7 +74,7 @@ rpc_srv_registerCall(rpc_srv_t * __restrict srv, u_sho /* search for duplicate */ if (AVL_FIND(tagRPCFuncs, &srv->srv_funcs, func)) { - io_free(func); + e_free(func); return 0; } @@ -116,7 +116,7 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, u_s RPC_FUNCS_UNLOCK(&srv->srv_funcs); AIT_FREE_VAL(&f->func_name); - io_free(f); + e_free(f); return 1; } @@ -127,7 +127,7 @@ rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, u_s * @tag = tag for function * return: NULL not found call, !=NULL return call */ -inline rpc_func_t * +rpc_func_t * rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t tag) { rpc_func_t tmp; @@ -151,7 +151,7 @@ rpc_srv_getCall(rpc_srv_t * __restrict srv, uint16_t t * @var = hash for variable * return: NULL not found, !=NULL return blob var */ -inline rpc_blob_t * +rpc_blob_t * rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t var) { rpc_blob_t *b, *tmp; @@ -215,6 +215,6 @@ rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); rpc_srv_blobFree(srv, b); - io_free(b); + e_free(b); return 1; }