[maemo-commits] [maemo-commits] r12754 - projects/haf/trunk/libosso/src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-07-17 10:51:28 +0300 (Tue, 17 Jul 2007)
New Revision: 12754

Modified:
   projects/haf/trunk/libosso/src/osso-cp-plugin.c
   projects/haf/trunk/libosso/src/osso-hw.c
   projects/haf/trunk/libosso/src/osso-rpc.c
Log:
more macro replacing


Modified: projects/haf/trunk/libosso/src/osso-cp-plugin.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-cp-plugin.c	2007-07-17 07:23:12 UTC (rev 12753)
+++ projects/haf/trunk/libosso/src/osso-cp-plugin.c	2007-07-17 07:51:28 UTC (rev 12754)
@@ -95,11 +95,7 @@
       return NULL;
     }
 
-  if (pthread_mutex_lock (&osso->mutex) == EDEADLK)
-    {
-      ULOG_ERR_F("mutex deadlock detected");
-      return NULL;
-    }
+  LOCK_OR_RETURN(osso->mutex, NULL);
 
   if (osso->cp_plugins)
     handle = g_hash_table_lookup (osso->cp_plugins, libname);
@@ -217,11 +213,7 @@
         return OSSO_OK;
     }
 
-    if (pthread_mutex_lock (&osso->mutex) == EDEADLK)
-    {
-        ULOG_ERR_F("mutex deadlock detected");
-        return OSSO_ERROR;
-    }
+    LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
 
     if (osso->cp_plugins)
       handle = g_hash_table_lookup(osso->cp_plugins, filename);

Modified: projects/haf/trunk/libosso/src/osso-hw.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-hw.c	2007-07-17 07:23:12 UTC (rev 12753)
+++ projects/haf/trunk/libosso/src/osso-hw.c	2007-07-17 07:51:28 UTC (rev 12754)
@@ -155,10 +155,7 @@
 
     dbus_error_init(&error);
 
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return OSSO_ERROR;
-    }
+    LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
 
     if (state->shutdown_ind) {
         osso->hw_cbs.shutdown_ind.cb = cb;
@@ -209,10 +206,7 @@
                                   USER_LOWMEM_ON_SIGNAL_OP,
                                   USER_LOWMEM_ON_SIGNAL_IF,
                                   lowmem_signal_handler, NULL, FALSE);
-            if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-                ULOG_ERR_F("mutex deadlock detected");
-                return OSSO_ERROR;
-            }
+            LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
         }
         osso->hw_cbs.memory_low_ind.set = TRUE;
 
@@ -318,10 +312,8 @@
 	state = (osso_hw_state_t*) &default_mask;
     }
 
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return OSSO_ERROR;
-    }
+    LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
+
     _unset_state_cb(shutdown_ind);
     if (state->memory_low_ind && osso->hw_cbs.memory_low_ind.set) {
         osso->hw_cbs.memory_low_ind.cb = NULL;
@@ -343,10 +335,7 @@
                              USER_LOWMEM_ON_SIGNAL_IF,
                              (const _osso_handler_f*)lowmem_signal_handler,
                              NULL, FALSE);
-        if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-            ULOG_ERR_F("mutex deadlock detected");
-            return OSSO_ERROR;
-        }
+        LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
     }
     _unset_state_cb(save_unsaved_data_ind);
     _unset_state_cb(system_inactivity_ind);

Modified: projects/haf/trunk/libosso/src/osso-rpc.c
===================================================================
--- projects/haf/trunk/libosso/src/osso-rpc.c	2007-07-17 07:23:12 UTC (rev 12753)
+++ projects/haf/trunk/libosso/src/osso-rpc.c	2007-07-17 07:51:28 UTC (rev 12754)
@@ -478,10 +478,7 @@
         return OSSO_ERROR;
     }
     
-    if (pthread_mutex_lock(&osso->mutex) == EDEADLK) {
-        ULOG_ERR_F("mutex deadlock detected");
-        return OSSO_ERROR;
-    }
+    LOCK_OR_RETURN(osso->mutex, OSSO_ERROR);
 
     if (strcmp(service, osso->service) != 0
         || (use_system_bus && !osso->systembus_service_registered)