head 1.2; access; symbols pkgsrc-2013Q2:1.2.0.24 pkgsrc-2013Q2-base:1.2 pkgsrc-2012Q4:1.2.0.22 pkgsrc-2012Q4-base:1.2 pkgsrc-2011Q4:1.2.0.20 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q2:1.2.0.18 pkgsrc-2011Q2-base:1.2 pkgsrc-2009Q4:1.2.0.16 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.14 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.12 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.10 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.8 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.6 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.4 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.2 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.1.0.14 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.12 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.10 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.8 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.6 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2007.07.08.20.49.06; author smb; state dead; branches; next 1.1; 1.1 date 2005.12.18.21.03.46; author rillig; state Exp; branches; next ; desc @@ 1.2 log @Fix patch file changes @ text @$NetBSD: patch-bd,v 1.1 2005/12/18 21:03:46 rillig Exp $ Keywords: c90 --- src/itdb_itunesdb.c.orig Sat Jul 16 09:13:50 2005 +++ src/itdb_itunesdb.c Sun Dec 18 21:59:37 2005 @@@@ -477,9 +477,10 @@@@ static gunichar2 *fixup_big_utf16 (gunic * return value after use */ static struct playcount *playcount_get_next (FImport *fimp) { - g_return_val_if_fail (fimp, NULL); + struct playcount *playcount; - struct playcount *playcount = g_list_nth_data (fimp->playcounts, 0); + g_return_val_if_fail (fimp, NULL); + playcount = g_list_nth_data (fimp->playcounts, 0); if (playcount) fimp->playcounts = g_list_remove (fimp->playcounts, playcount); @@@@ -1780,8 +1781,10 @@@@ static gboolean parse_fimp (FImport *fim { /* We just check if it's actually a playlist mhsd (type=2) or not (type = 1, should not be...) */ guint32 len = get32lint (cts, seek+8); + guint32 type; + CHECK_ERROR (fimp, FALSE); - guint32 type = get32lint (cts, seek+12); + type = get32lint (cts, seek+12); CHECK_ERROR (fimp, FALSE); if (type != 2) { /* this is not a playlist MHSD -> skip it */ @ 1.1 log @Added some patches for ISO C90 compatibility. @ text @d1 1 a1 1 $NetBSD$ @