E CVS: proto rephorm

[Enlightenment CVS]

Enlightenment CVS committal

Author  : rephorm
Project : e17
Module  : proto

Dir     : e17/proto/e_dbus/src/lib/hal


Modified Files:
        e_hal_device.c e_hal_manager.c 


Log Message:
don't seg on errors

===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_device.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_hal_device.c      22 Mar 2007 19:52:59 -0000      1.4
+++ e_hal_device.c      3 Jul 2007 15:29:24 -0000       1.5
@@ -53,7 +53,7 @@
     cb->func(cb->user_data, ret, err);
 
 error:
-  free(ret);
+  if (ret) free(ret);
   e_hal_callback_free(cb);
 }
 
@@ -167,8 +167,11 @@
     cb->func(cb->user_data, ret, err);
 
 error:
-  ecore_hash_destroy(ret->properties);
-  free(ret);
+  if (ret) 
+  {
+    if (ret->properties) ecore_hash_destroy(ret->properties);
+    free(ret);
+  }
   e_hal_callback_free(cb);
 }
 
@@ -218,7 +221,7 @@
     cb->func(cb->user_data, ret, err);
 
 error:
-  free(ret);
+  if(ret) free(ret);
   e_hal_callback_free(cb);
 }
 
===================================================================
RCS file: /cvs/e/e17/proto/e_dbus/src/lib/hal/e_hal_manager.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_hal_manager.c     3 Jul 2007 13:38:27 -0000       1.5
+++ e_hal_manager.c     3 Jul 2007 15:29:24 -0000       1.6
@@ -46,8 +46,11 @@
   cb->func(cb->user_data, ret, err);
 
 error:
-  if (ret && ret->strings) ecore_list_destroy(ret->strings);
-  free(ret);
+  if (ret)
+  {
+    if (ret->strings) ecore_list_destroy(ret->strings);
+    free(ret);
+  }
   e_hal_callback_free(cb);
 }
 
@@ -96,7 +99,7 @@
   cb->func(cb->user_data, ret, err);
 
 error:
-  free(ret);
+  if (ret) free(ret);
   e_hal_callback_free(cb);
 }
 
@@ -150,8 +153,11 @@
   cb->func(cb->user_data, ret, err);
 
 error:
-  if (ret && ret->strings) ecore_list_destroy(ret->strings);
-  free(ret);
+  if (ret)
+  {
+    if (ret->strings) ecore_list_destroy(ret->strings);
+    free(ret);
+  }
   e_hal_callback_free(cb);
 }
 
@@ -205,8 +211,11 @@
   cb->func(cb->user_data, ret, err);
 
 error:
-  if (ret && ret->strings) ecore_list_destroy(ret->strings);
-  free(ret);
+  if (ret)
+  {
+    if (ret->strings) ecore_list_destroy(ret->strings);
+    free(ret);
+  }
   e_hal_callback_free(cb);
 }
 



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs