Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/common
Modified Files:
evfs_cleanup.c evfs_event_helper.c evfs_io.c
Log Message:
* Null check wrappers
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_cleanup.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evfs_cleanup.c 23 Apr 2006 12:38:15 -0000 1.18
+++ evfs_cleanup.c 23 Apr 2006 13:34:36 -0000 1.19
@@ -136,14 +136,24 @@
evfs_meta_obj* obj;
Evas_List* l = event->meta->meta_list;
+ if (!evfs_object_client_is_get()) {
+ for (; l ;) {
+ obj = l->data;
+ l = evas_list_remove(event->meta->meta_list, obj);
+
+ free(obj->key);
+ free(obj->value);
+ free(obj);
+ }
+ evas_list_free(event->meta->meta_list);
+ }
+
if (evfs_object_client_is_get()) {
Ecore_List* keys;
char* key;
- char* value;
keys = ecore_hash_keys(event->meta->meta_hash);
while ( (key = ecore_list_remove_first(keys))) {
- value = ecore_hash_remove(event->meta->meta_hash, key);
- IF_FREE(value);
+ ecore_hash_remove(event->meta->meta_hash, key);
free(key);
}
ecore_hash_destroy(event->meta->meta_hash);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_event_helper.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evfs_event_helper.c 21 Apr 2006 15:10:16 -0000 1.26
+++ evfs_event_helper.c 23 Apr 2006 13:34:36 -0000 1.27
@@ -152,6 +152,8 @@
event->type = EVFS_EV_METADATA;
event->meta = calloc(1, sizeof(evfs_event_meta));
+
+ printf("Ret list is: %p\n", ret_list);
event->meta->meta_list = ret_list;
evfs_write_event(client, command, event);
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_io.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- evfs_io.c 22 Apr 2006 06:50:25 -0000 1.55
+++ evfs_io.c 23 Apr 2006 13:34:36 -0000 1.56
@@ -505,18 +505,22 @@
/*Now we have to push this list to a hash..*/
event->meta = meta;
- event->meta->meta_hash = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
-
- for (l = event->meta->meta_list; l; ) {
- obj = l->data;
- l = evas_list_remove(event->meta->meta_list, l->data);
-
- ecore_hash_set(event->meta->meta_hash, obj->key,
obj->value);
- free(obj);
+ if (event->meta) {
+ event->meta->meta_hash = ecore_hash_new(ecore_str_hash,
ecore_str_compare);
+ for (l = event->meta->meta_list; l; ) {
+ obj = l->data;
+ l = evas_list_remove(event->meta->meta_list,
l->data);
+
+ ecore_hash_set(event->meta->meta_hash,
obj->key, obj->value);
+ free(obj);
+
+ }
+ evas_list_free(event->meta->meta_list);
+ } else {
+ printf("No meta data object!\n");
}
- evas_list_free(event->meta->meta_list);
-
+
}
break;
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
