Provide a return value iff the function is not void.

4 files changed, 69 insertions, 1 deletions

diff --git a/audio/liteamp/distinfo b/audio/liteamp/distinfo
index 1009190136d..2d74c306155 100644
--- a/audio/liteamp/distinfo
+++ b/audio/liteamp/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 20:39:48 agc Exp $
+$NetBSD: distinfo,v 1.6 2012/07/03 18:20:29 joerg Exp $
 
 SHA1 (liteamp-0.2.4.2.tar.gz) = b810ccb6f464d1e4c26223021c7bd571ff62f5cc
 RMD160 (liteamp-0.2.4.2.tar.gz) = 7d8bd665307b65e6596f559378f8f6c636acab9f
 Size (liteamp-0.2.4.2.tar.gz) = 496190 bytes
 SHA1 (patch-ab) = 4cb36325a550686977b3570d8570f068799ec1ee
+SHA1 (patch-src_playlist.c) = bd2f1537bd9ed4aa58b80b20f5cc77ea047eed14
+SHA1 (patch-src_sidebar-item.c) = 282df3e6729872862868142cd925548fb99980fc
+SHA1 (patch-src_sidebar.c) = a7c443a17d33432f3faad6d69c5712e90e1a0da6
diff --git a/audio/liteamp/patches/patch-src_playlist.c b/audio/liteamp/patches/patch-src_playlist.c
new file mode 100644
index 00000000000..a13a26216ec
--- /dev/null
+++ b/audio/liteamp/patches/patch-src_playlist.c
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_playlist.c,v 1.1 2012/07/03 18:20:29 joerg Exp $
+
+--- src/playlist.c.orig	2012-07-03 15:28:01.000000000 +0000
++++ src/playlist.c
+@@ -507,7 +507,7 @@ gboolean playlist_show_dialog(Playlist* 
+     GtkTreeIter iter;
+     GtkTreePath* path;
+ 
+-    g_return_if_fail(IS_PLAYLIST(pl));
++    g_return_val_if_fail(IS_PLAYLIST(pl), FALSE);
+ 
+     // get the focused row to show properties
+     gtk_tree_view_get_cursor(GTK_TREE_VIEW(pl), &path, NULL);
+@@ -727,6 +727,7 @@ gboolean playlist_show_dialog(Playlist* 
+     }
+ 
+     gtk_widget_destroy(dlg);
++    return FALSE;
+ }
+ 
+ /*-----------------------------------------------------------------*/
+@@ -1189,7 +1190,7 @@ gchar* playlist_get_current_file(Playlis
+     GtkTreeIter iter;
+     gchar* filename;
+ 
+-    g_return_if_fail(IS_PLAYLIST(pl));
++    g_return_val_if_fail(IS_PLAYLIST(pl), NULL);
+ 
+     if(!playlist_get_current_row(pl, &iter)) return NULL;
+ 
diff --git a/audio/liteamp/patches/patch-src_sidebar-item.c b/audio/liteamp/patches/patch-src_sidebar-item.c
new file mode 100644
index 00000000000..e70622f2584
--- /dev/null
+++ b/audio/liteamp/patches/patch-src_sidebar-item.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_sidebar-item.c,v 1.1 2012/07/03 18:20:29 joerg Exp $
+
+--- src/sidebar-item.c.orig	2012-07-03 15:26:52.000000000 +0000
++++ src/sidebar-item.c
+@@ -80,7 +80,7 @@ GtkWidget* sidebar_item_new(gchar* title
+         
+     item->filename = (filename && filename[0])
+             ? g_strdup(filename)
+-            : g_strdup_printf("%s/.liteamp/%08x-%08x.pls", g_get_home_dir(), time(NULL), clock());
++            : g_strdup_printf("%s/.liteamp/%08llx-%08x.pls", g_get_home_dir(), (long long)time(NULL), clock());
+ 
+     gtk_button_set_relief(GTK_BUTTON(item), GTK_RELIEF_NONE);
+     gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(item), FALSE);
+@@ -153,7 +153,7 @@ gboolean sidebar_item_show_dialog(Sideba
+     GtkWidget* icon_pe;
+     gint result;
+ 
+-    g_return_if_fail(IS_SIDEBAR_ITEM(item));
++    g_return_val_if_fail(IS_SIDEBAR_ITEM(item), FALSE);
+ 
+     dlg = gtk_dialog_new_with_buttons(_("Playlist Properties"),
+             liteamp_get_app_window(),
diff --git a/audio/liteamp/patches/patch-src_sidebar.c b/audio/liteamp/patches/patch-src_sidebar.c
new file mode 100644
index 00000000000..8e8056276aa
--- /dev/null
+++ b/audio/liteamp/patches/patch-src_sidebar.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_sidebar.c,v 1.1 2012/07/03 18:20:29 joerg Exp $
+
+--- src/sidebar.c.orig	2012-07-03 15:25:36.000000000 +0000
++++ src/sidebar.c
+@@ -271,7 +271,7 @@ SidebarItem* sidebar_get_active_item(Sid
+     GList* list;
+     SidebarItem* item;
+ 
+-    g_return_if_fail(IS_SIDEBAR(sidebar));
++    g_return_val_if_fail(IS_SIDEBAR(sidebar), NULL);
+ 
+     list = sidebar->items;
+     while(list != NULL && list->data != NULL) {