Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/plugins/meta
Modified Files:
evfs_meta_audio.c
Log Message:
* Null check wrappers
===================================================================
RCS file: /cvs/e/e17/apps/evfs/src/plugins/meta/evfs_meta_audio.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evfs_meta_audio.c 21 Apr 2006 15:10:17 -0000 1.1
+++ evfs_meta_audio.c 23 Apr 2006 13:34:36 -0000 1.2
@@ -75,14 +75,14 @@
Evas_List* ret_list = NULL;
evfs_meta_obj* obj;
-
+
taglib_file = taglib_file_new(command->file_command.files[0]->path);
- if (!taglib_file) goto done;
+ if (!taglib_file) goto faildone;
taglib_tag = taglib_file_tag(taglib_file);
if (!taglib_tag) {
taglib_file_free(taglib_file);
- goto done;
+ goto faildone;
}
tmp = taglib_tag_artist(taglib_tag);
@@ -92,6 +92,11 @@
obj->value = strdup(tmp);
ret_list = evas_list_append(ret_list, obj);
+ } else {
+ obj = calloc(1,sizeof(evfs_meta_obj));
+ obj->key = strdup("artist");
+ obj->value = NULL;
+ ret_list = evas_list_append(ret_list, obj);
}
tmp = taglib_tag_title(taglib_tag);
@@ -100,7 +105,11 @@
obj->key = strdup("title");
obj->value = strdup(tmp);
ret_list = evas_list_append(ret_list, obj);
-
+ } else {
+ obj = calloc(1,sizeof(evfs_meta_obj));
+ obj->key = strdup("title");
+ obj->value = NULL;
+ ret_list = evas_list_append(ret_list, obj);
}
taglib_props = taglib_file_audioproperties(taglib_file);
@@ -112,9 +121,22 @@
obj->value = strdup(buf);
ret_list = evas_list_append(ret_list, obj);
+ } else {
+ obj = calloc(1,sizeof(evfs_meta_obj));
+ obj->key = strdup("length");
+ obj->value = NULL;
+ ret_list = evas_list_append(ret_list, obj);
}
taglib_file_free(taglib_file);
+
+ goto done;
+
+ faildone:
+ obj = calloc(1,sizeof(evfs_meta_obj));
+ obj->key = strdup("file");
+ obj->value = strdup("invalid");
+ ret_list = evas_list_append(ret_list, obj);
done:
return ret_list;
-------------------------------------------------------
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
