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.50 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.48 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.46 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.44 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.42 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.40 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.38 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.36 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.34 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.32 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.30 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.28 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.26 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.24 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.22 pkgsrc-2008Q1:1.4.0.20 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.18 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.16 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.14 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.12 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.10 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.8 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.6 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.4 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.2 pkgsrc-2005Q4-base:1.4 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 2005.12.11.20.48.46; author joerg; 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.30; 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-ak,v 1.4 2005/12/11 20:48:46 joerg Exp $ - needs stdlib.h, not malloc.h - support BSD cdroms - move function "prototypes" outside of functions - use malloc properly --- program.c.orig 1993-01-12 18:59:49.000000000 +0000 +++ program.c @@@@ -27,10 +27,13 @@@@ # include # include -# include +# include # include "debug.h" # include "cdrom_globs.h" +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun # include "cdrom_sun.h" #endif @@@@ -52,6 +55,15 @@@@ static Widget new_track_button; static Boolean adding_to_new_track = False; static struct prognode *current_node = NULL; +static void cb_move_program_ptr(); +static void cb_clear_program(); +static void cb_cancel_program(); +static void cb_save_program(); +static void cb_trackbuttons(); +static void cb_add_10(); +static void cb_new_track(); +static void cb_program_all(); + void program_form_setup (parent_widget) Widget parent_widget; @@@@ -67,15 +79,6 @@@@ program_form_setup (parent_widget) Widget save_button; Widget all_button; - extern void cb_move_program_ptr(); - extern void cb_clear_program(); - extern void cb_cancel_program(); - extern void cb_save_program(); - extern void cb_trackbuttons(); - extern void cb_add_10(); - extern void cb_new_track(); - extern void cb_program_all(); - /* * create program form as a non-managed widget, because this * form "pops up" when requested, as part of the main form, and @@@@ -291,7 +294,7 @@@@ unsigned char track; if (cdi.program == NULL) { - new = (struct prognode *) malloc(sizeof(struct prognode)); + new = malloc(sizeof(struct prognode)); new->track = track; new->next = NULL; new->prev = NULL; @@@@ -304,7 +307,7 @@@@ unsigned char track; else if (current_node == NULL) /* pre-insert */ { - new = (struct prognode *) malloc(sizeof(struct prognode)); + new = malloc(sizeof(struct prognode)); new->track = track; new->next = cdi.program; new->prev = NULL; @@@@ -327,7 +330,7 @@@@ unsigned char track; (insert_point != current_node)) insert_point = insert_point->next; - new = (struct prognode *) malloc(sizeof(struct prognode)); + new = malloc(sizeof(struct prognode)); new->track = track; new->next = insert_point->next; new->prev = insert_point; @ 1.4 log @DragonFly support. XXX Is sys/buf.h needed at all in cdrom_freebsd.c? @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 1999/09/06 16:37:43 tron Exp $ d3 7 a9 2 --- program.c.orig Tue Jan 12 19:59:49 1993 +++ program.c Mon Sep 6 18:37:05 1999 d15 1 a15 1 +# include d25 1 a25 1 @@@@ -52,6 +55,15 @@@@ d41 1 a41 2 @@@@ -66,15 +78,6 @@@@ Widget cancel_button; d44 1 a44 1 - d53 1 a53 1 d56 28 @ 1.3 log @Fix RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d14 1 a14 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) @ 1.2 log @Convert patches to unified output format. @ text @d1 1 a1 1 $NetBSD d4 1 a4 1 +++ program.c Mon Sep 6 18:22:07 1999 @ 1.1 log @Added and fixed patches to allow build on alpha. Closes PR 5815 (Tim Rightnour) @ text @d1 51 a51 65 $NetBSD$ *** program.c Tue Jan 12 10:59:49 1993 --- /users/swallace/work/xcdplayer/program.c Wed Feb 23 07:36:55 1994 *************** *** 27,36 **** # include # include ! # include # include "debug.h" # include "cdrom_globs.h" #ifdef sun # include "cdrom_sun.h" #endif --- 27,39 ---- # include # include ! # include # include "debug.h" # include "cdrom_globs.h" + #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) + # include "cdrom_freebsd.h" + #endif #ifdef sun # include "cdrom_sun.h" #endif *************** *** 52,57 **** --- 55,69 ---- static Boolean adding_to_new_track = False; static struct prognode *current_node = NULL; + static void cb_move_program_ptr(); + static void cb_clear_program(); + static void cb_cancel_program(); + static void cb_save_program(); + static void cb_trackbuttons(); + static void cb_add_10(); + static void cb_new_track(); + static void cb_program_all(); + void program_form_setup (parent_widget) Widget parent_widget; *************** *** 66,80 **** Widget cancel_button; Widget save_button; Widget all_button; - - extern void cb_move_program_ptr(); - extern void cb_clear_program(); - extern void cb_cancel_program(); - extern void cb_save_program(); - extern void cb_trackbuttons(); - extern void cb_add_10(); - extern void cb_new_track(); - extern void cb_program_all(); /* * create program form as a non-managed widget, because this --- 78,83 ---- @