[BACK]Return to patch-bb CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / audio / xmmix / patches

File: [cvs.NetBSD.org] / pkgsrc / audio / xmmix / patches / patch-bb (download)

Revision 1.3, Sun Sep 4 22:25:36 2011 UTC (9 years, 4 months ago) by dholland
Branch: MAIN
CVS Tags: pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, HEAD
Changes since 1.2: +14 -1 lines

void main

$NetBSD: patch-bb,v 1.3 2011/09/04 22:25:36 dholland Exp $

- initialize errfp (but why twice?)
- fix void main
- pass the XtAppContext to widget.c, which now needs it

--- main.c.orig	1996-11-07 16:01:43.000000000 +0000
+++ main.c
@@ -33,7 +33,7 @@ static char *_main_c_ident_ = "@(#)main.
 bool_t			exit_flag;	/* Flag indicating end of application */
 appdata_t		app_data;	/* Options data */
 widgets_t		widgets;	/* Holder of all widgets */
-FILE			*errfp = stderr;/* Error message stream */
+FILE			*errfp;/* Error message stream */
 
 
 /***********************
@@ -95,7 +95,7 @@ usage(int argc, char **argv)
  * main
  *	The main function
  */
-void
+int
 main(int argc, char **argv)
 {
 	XtAppContext	app;
@@ -103,6 +103,7 @@ main(int argc, char **argv)
 
 	/* Initialize variables */
 	exit_flag = FALSE;
+	errfp = stderr;
 
 	/* Handle some signals */
 	signal(SIGINT, onsig);
@@ -159,7 +160,7 @@ main(int argc, char **argv)
 	post_realize_config(&widgets);
 
 	/* Register callback routines */
-	register_callbacks(&widgets);
+	register_callbacks(&widgets, app);
 
 	/* Initialize screen controls */
 	mx_start(&widgets);