head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.118 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.116 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.114 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.112 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.110 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.108 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.106 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.104 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.102 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.100 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.98 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.96 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.94 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.92 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.90 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.88 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.5.0.86 pkgsrc-2022Q1-base:1.5 pkgsrc-2021Q4:1.5.0.84 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.82 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.80 pkgsrc-2021Q2-base:1.5 pkgsrc-2021Q1:1.5.0.78 pkgsrc-2021Q1-base:1.5 pkgsrc-2020Q4:1.5.0.76 pkgsrc-2020Q4-base:1.5 pkgsrc-2020Q3:1.5.0.74 pkgsrc-2020Q3-base:1.5 pkgsrc-2020Q2:1.5.0.70 pkgsrc-2020Q2-base:1.5 pkgsrc-2020Q1:1.5.0.50 pkgsrc-2020Q1-base:1.5 pkgsrc-2019Q4:1.5.0.72 pkgsrc-2019Q4-base:1.5 pkgsrc-2019Q3:1.5.0.68 pkgsrc-2019Q3-base:1.5 pkgsrc-2019Q2:1.5.0.66 pkgsrc-2019Q2-base:1.5 pkgsrc-2019Q1:1.5.0.64 pkgsrc-2019Q1-base:1.5 pkgsrc-2018Q4:1.5.0.62 pkgsrc-2018Q4-base:1.5 pkgsrc-2018Q3:1.5.0.60 pkgsrc-2018Q3-base:1.5 pkgsrc-2018Q2:1.5.0.58 pkgsrc-2018Q2-base:1.5 pkgsrc-2018Q1:1.5.0.56 pkgsrc-2018Q1-base:1.5 pkgsrc-2017Q4:1.5.0.54 pkgsrc-2017Q4-base:1.5 pkgsrc-2017Q3:1.5.0.52 pkgsrc-2017Q3-base:1.5 pkgsrc-2017Q2:1.5.0.48 pkgsrc-2017Q2-base:1.5 pkgsrc-2017Q1:1.5.0.46 pkgsrc-2017Q1-base:1.5 pkgsrc-2016Q4:1.5.0.44 pkgsrc-2016Q4-base:1.5 pkgsrc-2016Q3:1.5.0.42 pkgsrc-2016Q3-base:1.5 pkgsrc-2016Q2:1.5.0.40 pkgsrc-2016Q2-base:1.5 pkgsrc-2016Q1:1.5.0.38 pkgsrc-2016Q1-base:1.5 pkgsrc-2015Q4:1.5.0.36 pkgsrc-2015Q4-base:1.5 pkgsrc-2015Q3:1.5.0.34 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.32 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.30 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.28 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.26 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.24 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.22 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.5.0.20 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.18 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.16 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.14 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.12 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.10 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.8 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.6 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.4 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.2 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.4.0.44 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.42 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.40 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.38 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.36 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.34 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.32 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.30 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.28 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.26 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.24 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.22 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.20 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.18 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.16 pkgsrc-2008Q1:1.4.0.14 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.12 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.10 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.8 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.6 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.4 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.2 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.3.0.30 pkgsrc-2006Q2-base:1.3 pkgsrc-2006Q1:1.3.0.28 pkgsrc-2006Q1-base:1.3 pkgsrc-2005Q4:1.3.0.26 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.24 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.22 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.3.0.20 pkgsrc-2005Q1-base:1.3 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.3 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1 netbsd-1-3-PATCH003:1.1; locks; strict; comment @# @; 1.5 date 2011.09.04.22.05.39; author dholland; state Exp; branches; next 1.4; 1.4 date 2006.08.12.14.51.39; author darcy; state Exp; branches; next 1.3; 1.3 date 99.09.06.16.37.43; author tron; state Exp; branches; next 1.2; 1.2 date 99.09.06.16.36.33; author tron; state Exp; branches; next 1.1; 1.1 date 98.08.23.06.49.29; author garbled; state Exp; branches; next ; desc @@ 1.5 log @Fix void main, caught by clang. While here, fix other problems caught by gcc: - casting malloc instead of including - casting calloc instead of including - failing to include with bad consequences for -current. PKGREVISION -> 5. @ text @$NetBSD: patch-aj,v 1.4 2006/08/12 14:51:39 darcy Exp $ - Rearrange position of some static functions to allow them to self-define and compile under GCC-4. - fix void main. --- main.c.orig 1993-01-12 18:59:36.000000000 +0000 +++ main.c @@@@ -23,13 +23,36 @@@@ Widget top_form; +extern AppData app_data; + +static void +chk_debug(argc, argv) + int argc; + char **argv; +{ + int i; + + /* ugly hack */ + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "-debug") == 0) { + app_data.debug = True; + break; + } + } +} + void +usage() { + (void) fprintf(stderr, "usage: xcdplayer [-debug]\n"); + + exit(1); +} + +int main(argc, argv) int argc; char **argv; { - static void chk_debug(); - chk_debug(argc, argv); /* gets resources, & creates main form */ @@@@ -55,26 +78,3 @@@@ main(argc, argv) exit(0); } - -static void -chk_debug(argc, argv) - int argc; - char **argv; -{ - int i; - - /* ugly hack */ - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-debug") == 0) { - debug = True; - break; - } - } -} - -void -usage() { - (void) fprintf(stderr, "usage: xcdplayer [-debug]\n"); - - exit(1); -} @ 1.4 log @Rearrange position of some static functions to allow them to self-define and compile under GCC-4. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.3 1999/09/06 16:37:43 tron Exp $ d3 6 a8 1 --- main.c.orig Tue Jan 12 19:59:36 1993 d32 1 a32 1 +void d39 1 a39 1 void @ 1.3 log @Fix RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- main.c.orig Tue Jan 12 19:59:36 1993 +++ main.c Mon Sep 6 18:37:05 1999 @@@@ -23,6 +23,8 @@@@ d11 23 d37 22 a58 4 @@@@ -66,7 +68,7 @@@@ /* ugly hack */ for (i = 1; i < argc; i++) { if (strcmp(argv[i], "-debug") == 0) { d60 11 a70 4 + app_data.debug = True; break; } } @ 1.2 log @Convert patches to unified output format. @ text @d1 1 a1 1 $NetBSD d4 1 a4 1 +++ main.c Mon Sep 6 18:22:06 1999 @ 1.1 log @Added and fixed patches to allow build on alpha. Closes PR 5815 (Tim Rightnour) @ text @d1 7 a7 10 $NetBSD$ --- logo_setup.c.orig Tue Jan 12 11:59:46 1993 +++ logo_setup.c Thu Jul 23 00:08:28 1998 @@@@ -30,2 +30,5 @@@@ # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) +# include "cdrom_freebsd.h" +#endif #ifdef sun @@@@ -45,2 +48,4 @@@@ d11 11 a21 42 static Widget track_button_widget; @@@@ -57,2 +62,10 @@@@ static int vol; +extern void leds_label_setup(); +static void cb_track_button(); +static void cb_timer_button(); +static void volume_jump_proc(); +static void volume_scroll_proc(); +static void popup_title_dialog(); +static void popdown_title_dialog(); + @@@@ -62,10 +75,2 @@@@ { - extern void leds_label_setup(); - extern void cb_track_button(); - extern void cb_timer_button(); - extern void volume_jump_proc(); - extern void volume_scroll_proc(); - extern void popup_title_dialog(); - extern void popdown_title_dialog(); - Widget version_label_widget; @@@@ -128,3 +133,3 @@@@ - if (display_timer == True) + if (app_data.display_timer == True) { timer_button_widget = XtCreateManagedWidget("timerButton", @@@@ -134,5 +139,6 @@@@ - XtAddCallback(timer_button_widget, XtNcallback, cb_timer_button, 0); - - timer_button_update(); + XtAddCallback(timer_button_widget, XtNcallback, + cb_timer_button, 0); + timer_button_update(); + } thumb_pixmap = XCreateBitmapFromData(XtDisplay(logo_form_widget), @@@@ -173,6 +179,6 @@@@ if ((vol = cdrom_get_volume()) == 0) { - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; a22 14 #else - vol = (int) ((MAXVOL - volbase) * 0.75) + volbase; + vol = (int) ((MAXVOL - app_data.volbase) * 0.75) + app_data.volbase; #endif @@@@ -358,3 +364,3 @@@@ - if (display_timer == False) + if (app_data.display_timer == False) return; @@@@ -415,3 +421,3 @@@@ vol = (*(float *) percent) * MAXVOL; - vol = (vol * volpcent) + volbase; + vol = (vol * app_data.volpcent) + app_data.volbase; #endif @