libaitrpc/src/lists.c - diff

Return to lists.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitrpc / src

Diff for /libaitrpc/src/lists.c between versions 1.4.2.3 and 1.4.2.8

version 1.4.2.3, 2011/09/01 11:39:26	version 1.4.2.8, 2011/09/07 01:19:19
Line 254 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con	Line 254 rpc_srv_unregisterCall(rpc_srv_t * __restrict srv, con
func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2);	func.func_tag = crcFletcher16((u_short*) str, sizeof str / 2);
func.func_hash = hash_fnv((char*) str, sizeof str);	func.func_hash = hash_fnv((char*) str, sizeof str);

	pthread_mutex_lock(&srv->srv_mtx);
f = rpc_srv_getCall(srv, func.func_tag, func.func_hash);	f = rpc_srv_getCall(srv, func.func_tag, func.func_hash);
if (!f) /* not found element for unregister */	if (!f) /* not found element for unregister */
return 0;	return 0;

pthread_mutex_lock(&srv->srv_mtx);	if (srv->srv_funcs == f) /* if is 1st element */
if (srv->srv_funcs == f) { /* if is 1st element */
srv->srv_funcs = srv->srv_funcs->func_next;	srv->srv_funcs = srv->srv_funcs->func_next;
	else {
if (f->func_vars)
rpc_srv_destroyVars(f);
free(f);
} else {
for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next);	for (curr = srv->srv_funcs; curr->func_next != f; curr = curr->func_next);
curr->func_next = curr->func_next->func_next;	curr->func_next = curr->func_next->func_next;

if (f->func_vars)
rpc_srv_destroyVars(f);
free(f);
}	}
	rpc_srv_destroyVars(f);
	free(f);
pthread_mutex_unlock(&srv->srv_mtx);	pthread_mutex_unlock(&srv->srv_mtx);

return 1;	return 1;
Line 353 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v	Line 347 rpc_srv_getBLOB(rpc_srv_t * __restrict srv, uint32_t v
return NULL;	return NULL;
}	}

pthread_mutex_lock(&srv->srv_blob.mtx);
for (b = srv->srv_blob.blobs; b; b = b->blob_next) {	for (b = srv->srv_blob.blobs; b; b = b->blob_next) {
if (b->blob_var == var)	if (b->blob_var == var)
break;	break;
}	}
pthread_mutex_unlock(&srv->srv_blob.mtx);

return b;	return b;
}	}
Line 409 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin	Line 401 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
b = rpc_srv_getBLOB(srv, var);	b = rpc_srv_getBLOB(srv, var);
if (!b) /* not found element for unregister */	if (!b) /* not found element for unregister */
return 0;	return 0;
	/* if BLOB is unmapped force to unmap object */
	if (b->blob_data)
	rpc_srv_blobUnmap(b);

pthread_mutex_lock(&srv->srv_blob.mtx);	pthread_mutex_lock(&srv->srv_blob.mtx);
if (srv->srv_blob.blobs == b) { /* if is 1st element */	if (srv->srv_blob.blobs == b) { /* if is 1st element */
Line 417 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin	Line 412 rpc_srv_unregisterBLOB(rpc_srv_t * __restrict srv, uin
for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next);	for (curr = srv->srv_blob.blobs; curr->blob_next != b; curr = curr->blob_next);
curr->blob_next = curr->blob_next->blob_next;	curr->blob_next = curr->blob_next->blob_next;
}	}
	pthread_mutex_unlock(&srv->srv_blob.mtx);
rpc_srv_blobFree(srv, b);	rpc_srv_blobFree(srv, b);
free(b);	free(b);
pthread_mutex_unlock(&srv->srv_blob.mtx);

return 1;	return 1;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4.2.3
changed lines
	Added in v.1.4.2.8