[haiku-commits] haiku: hrev45147 - src/libs/compat/freebsd_network
- From: korli@xxxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 10 Jan 2013 23:57:02 +0100 (CET)
hrev45147 adds 1 changeset to branch 'master'
old head: 4f5a4183de6cb47826c135c333375e60ca1434c8
new head: bf4355a48e5a91c42f0bd7cdaa3d242d1d9f27c3
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=bf4355a+%5E4f5a418
----------------------------------------------------------------------------
bf4355a: freebsd network compat layer: fix for hrev45146
* MTX_DEF is the default type: it shouldn't be tested against but used
as the default type.
[ Jerome Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45147
Commit: bf4355a48e5a91c42f0bd7cdaa3d242d1d9f27c3
URL: http://cgit.haiku-os.org/haiku/commit/?id=bf4355a
Author: Jerome Duval <jerome.duval@xxxxxxxxx>
Date: Thu Jan 10 22:54:19 2013 UTC
----------------------------------------------------------------------------
1 file changed, 8 insertions(+), 9 deletions(-)
src/libs/compat/freebsd_network/mutex.c | 17 ++++++++---------
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/mutex.c
b/src/libs/compat/freebsd_network/mutex.c
index 058be10..f626b35 100644
--- a/src/libs/compat/freebsd_network/mutex.c
+++ b/src/libs/compat/freebsd_network/mutex.c
@@ -21,14 +21,13 @@ void
mtx_init(struct mtx *mutex, const char *name, const char *type,
int options)
{
- if (options & MTX_DEF) {
- mutex_init_etc(&mutex->u.mutex.lock, name,
MUTEX_FLAG_CLONE_NAME);
- mutex->u.mutex.owner = -1;
- } else if (options & MTX_RECURSE) {
+ if (options & MTX_RECURSE) {
recursive_lock_init_etc(&mutex->u.recursive, name,
MUTEX_FLAG_CLONE_NAME);
- } else
- panic("fbsd: unsupported mutex type");
+ } else {
+ mutex_init_etc(&mutex->u.mutex.lock, name,
MUTEX_FLAG_CLONE_NAME);
+ mutex->u.mutex.owner = -1;
+ }
mutex->type = options;
}
@@ -37,10 +36,10 @@ mtx_init(struct mtx *mutex, const char *name, const char
*type,
void
mtx_destroy(struct mtx *mutex)
{
- if (mutex->type & MTX_DEF)
- mutex_destroy(&mutex->u.mutex.lock);
- else if (mutex->type & MTX_RECURSE)
+ if (mutex->type & MTX_RECURSE)
recursive_lock_destroy(&mutex->u.recursive);
+ else
+ mutex_destroy(&mutex->u.mutex.lock);
}
Other related posts:
