cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove casts no longer needed now that system headers define NULL as a pointer.

Browse Source 
reads ok to ckuethe@ (maintainer)
This commit is contained in:
sthen 2011-10-18 18:57:15 +00:00
parent 1e6bea521f
commit 31a9edf281
2 changed files with 3 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/gtkpod/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.40 2011/10/12 12:54:30 jasper Exp $
# $OpenBSD: Makefile,v 1.41 2011/10/18 18:57:15 sthen Exp $
COMMENT= GTK+2 program to synchronize an Apple iPod
DISTNAME= gtkpod-0.99.14
REVISION= 6
REVISION= 7
CATEGORIES= audio x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gtkpod/}

91
audio/gtkpod/patches/patch-src_file_itunesdb_c
View File

@ -1,95 +1,6 @@
$OpenBSD: patch-src_file_itunesdb_c,v 1.5 2009/03/06 20:44:24 ckuethe Exp $
$OpenBSD: patch-src_file_itunesdb_c,v 1.6 2011/10/18 18:57:15 sthen Exp $
--- src/file_itunesdb.c.orig Sat Jan 17 22:52:32 2009
+++ src/file_itunesdb.c Thu Feb 26 23:12:27 2009
@@ -585,7 +585,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
gp_itdb_add_extra_full (itdb);
eitdb = itdb->userdata;
- g_return_val_if_fail (eitdb, (release_widgets(), NULL));
+ g_return_val_if_fail (eitdb, (release_widgets(), (iTunesDB *)NULL));
eitdb->offline = offline;
@@ -610,9 +610,9 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
Track *track = gl->data;
ExtraTrackData *etr;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
etr = track->userdata;
- g_return_val_if_fail (etr, (release_widgets(), NULL));
+ g_return_val_if_fail (etr, (release_widgets(), (iTunesDB *)NULL));
fill_in_extended_info (track, total, num);
gp_track_validate_entries (track);
/* properly set value for has_artwork */
@@ -652,7 +652,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
while (extendeddeletion)
{
Track *track = extendeddeletion->data;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
mark_track_for_deletion (itdb, track);
extendeddeletion = g_list_delete_link (extendeddeletion,
extendeddeletion);
@@ -676,15 +676,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
GHashTable *track_hash = g_hash_table_new (g_direct_hash,
g_direct_equal);
Playlist *mpl = itdb_playlist_mpl (itdb);
- g_return_val_if_fail (mpl, (release_widgets(), NULL));
- g_return_val_if_fail (old_eitdb, (release_widgets(), NULL));
+ g_return_val_if_fail (mpl, (release_widgets(), (iTunesDB *)NULL));
+ g_return_val_if_fail (old_eitdb, (release_widgets(), (iTunesDB *)NULL));
/* add tracks from @old_itdb to new itdb */
for (gl=old_itdb->tracks; gl; gl=gl->next)
{
Track *duptr, *addtr;
Track *track = gl->data;
- g_return_val_if_fail (track, (release_widgets(), NULL));
+ g_return_val_if_fail (track, (release_widgets(), (iTunesDB *)NULL));
duptr = itdb_track_duplicate (track);
/* add to database -- if duplicate detection is on and the
same track already exists in the database, the already
@@ -703,15 +703,15 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
GList *glm;
Playlist *duppl;
Playlist *pl = gl->next->data; /* skip MPL */
- g_return_val_if_fail (pl, (release_widgets(), NULL));
+ g_return_val_if_fail (pl, (release_widgets(), (iTunesDB *)NULL));
duppl = itdb_playlist_duplicate (pl);
/* switch members */
for (glm=duppl->members; glm; glm=glm->next)
{
Track *newtr;
- g_return_val_if_fail (glm->data, (release_widgets(), NULL));
+ g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
newtr = g_hash_table_lookup (track_hash, glm->data);
- g_return_val_if_fail (newtr, (release_widgets(), NULL));
+ g_return_val_if_fail (newtr, (release_widgets(), (iTunesDB *)NULL));
glm->data = newtr;
}
/* if it's the podcasts list, don't add the list again if
@@ -722,7 +722,7 @@ iTunesDB *gp_import_itdb (iTunesDB *old_itdb, const gi
Playlist *podcasts = itdb_playlist_podcasts (itdb);
for (glm=duppl->members; glm; glm=glm->next)
{
- g_return_val_if_fail (glm->data, (release_widgets(), NULL));
+ g_return_val_if_fail (glm->data, (release_widgets(), (iTunesDB *)NULL));
itdb_playlist_add_track (podcasts, glm->data, -1);
}
itdb_playlist_free (duppl);
@@ -801,9 +801,9 @@ static iTunesDB *gp_merge_itdb (iTunesDB *old_itdb)
ExtraiTunesDBData *old_eitdb;
iTunesDB *new_itdb;
- g_return_val_if_fail (old_itdb, NULL);
+ g_return_val_if_fail (old_itdb, (iTunesDB *)NULL);
old_eitdb = old_itdb->userdata;
- g_return_val_if_fail (old_eitdb, NULL);
+ g_return_val_if_fail (old_eitdb, (iTunesDB *)NULL);
if (old_itdb->usertype & GP_ITDB_TYPE_LOCAL)
{
@@ -905,8 +905,11 @@ iTunesDB *gp_load_ipod (iTunesDB *itdb)
ok_to_load = FALSE;
}