E CVS: apps/euphoria tsauerbeck

[enlightenment-cvs]

Enlightenment CVS committal

Author  : tsauerbeck
Project : e17
Module  : apps/euphoria

Dir     : e17/apps/euphoria/src


Modified Files:
        playlist_item.c 


Log Message:
put these sanity checks everywhere
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/euphoria/src/playlist_item.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- playlist_item.c     29 Feb 2004 14:52:07 -0000      1.7
+++ playlist_item.c     1 Mar 2004 10:47:04 -0000       1.8
@@ -1,5 +1,5 @@
 /*
- * $Id: playlist_item.c,v 1.7 2004/02/29 14:52:07 atmosphere Exp $
+ * $Id: playlist_item.c,v 1.8 2004/03/01 10:47:04 tsauerbeck Exp $
  * vim:noexpandtab:sw=4:sts=4:ts=4
  */
 
@@ -13,7 +13,14 @@
 #include "utils.h"
 
 const char *playlist_item_artist_get(PlayListItem *pli) {
-       const char *tmp = x_hash_lookup(pli->properties, "artist");
+       const char *tmp;
+
+       assert(pli);
+
+       if (!pli->properties)
+               return "Unknown";
+
+       tmp = x_hash_lookup(pli->properties, "artist");
 
        return tmp ? tmp : "Unknown";
 }
@@ -21,6 +28,11 @@
 const char *playlist_item_title_get(PlayListItem *pli) {
        const char *title, *url;
 
+       assert(pli);
+
+       if (!pli->properties)
+               return "Unknown";
+
        if ((title = x_hash_lookup(pli->properties, "title")))
                return title;
 
@@ -35,15 +47,26 @@
 }
 
 const char *playlist_item_album_get(PlayListItem *pli) {
-       const char *tmp = x_hash_lookup(pli->properties, "album");
+       const char *tmp;
+
+       assert(pli);
+
+       if (!pli->properties)
+               return "Unknown";
+
+       tmp = x_hash_lookup(pli->properties, "album");
 
        return tmp ? tmp : "Unknown";
 }
 
 unsigned int playlist_item_duration_get(PlayListItem *pli) {
        void *tmp;
-       
-       if (!pli->properties) return 0;
+
+       assert(pli);
+
+       if (!pli->properties)
+               return 0;
+
        if ((tmp = x_hash_lookup(pli->properties, "duration")))
                return atoi(tmp) / 1000;
        else
@@ -53,6 +76,11 @@
 unsigned int playlist_item_samplerate_get(PlayListItem *pli) {
        void *tmp;
 
+       assert(pli);
+
+       if (!pli->properties)
+               return 0;
+
        if ((tmp = x_hash_lookup(pli->properties, "samplerate")))
                return atoi(tmp);
        else
@@ -62,6 +90,11 @@
 unsigned int playlist_item_bitrate_get(PlayListItem *pli) {
        void *tmp;
 
+       assert(pli);
+
+       if (!pli->properties)
+               return 0;
+
        if ((tmp = x_hash_lookup(pli->properties, "bitrate")))
                return atoi(tmp);
        else




-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs