[Debburn-changes] r593 - cdrkit/trunk/wodim

[Eduard Bloch]

Author: blade
Date: 2006-12-08 15:01:26 +0100 (Fri, 08 Dec 2006)
New Revision: 593

Modified:
   cdrkit/trunk/wodim/defaults.c
   cdrkit/trunk/wodim/defaults.h
   cdrkit/trunk/wodim/wodim.h
Log:
Restored the declarations of cdr_defaults methods

Modified: cdrkit/trunk/wodim/defaults.c
===================================================================
--- cdrkit/trunk/wodim/defaults.c	2006-12-08 13:41:35 UTC (rev 592)
+++ cdrkit/trunk/wodim/defaults.c	2006-12-08 14:01:26 UTC (rev 593)
@@ -37,7 +37,6 @@
 cdr_defaults(char **p_dev_name, int *p_speed, long *p_fifosize, 
 					char **p_drv_opts)
 {
-	FILE *stream;
 	char *t; /* tmp */
 	int wc=0;
 	char loc[256], sSpeed[11], sFs[11], sOpts[81];

Modified: cdrkit/trunk/wodim/defaults.h
===================================================================
--- cdrkit/trunk/wodim/defaults.h	2006-12-08 13:41:35 UTC (rev 592)
+++ cdrkit/trunk/wodim/defaults.h	2006-12-08 14:01:26 UTC (rev 593)
@@ -0,0 +1,14 @@
+/* 
+ * Copyright 2006 Eduard Bloch 
+ *
+ * This code emulates the interface of the original defaults.c file. However,
+ * it improves its behaviour and deals with corner cases: prepended and
+ * trailing spaces on variable and value, no requirement for using TABs
+ * anymore. No requirements to insert dummy values like -1 or "".
+ *
+ */
+#ifndef _DEFAULTS_H_
+#define _DEFAULTS_H_
+extern int	getnum(char *arg, long *valp);
+void cdr_defaults(char **p_dev_name, int *p_speed, long *p_fifosize, char **p_drv_opts);
+#endif

Modified: cdrkit/trunk/wodim/wodim.h
===================================================================
--- cdrkit/trunk/wodim/wodim.h	2006-12-08 13:41:35 UTC (rev 592)
+++ cdrkit/trunk/wodim/wodim.h	2006-12-08 14:01:26 UTC (rev 593)
@@ -1209,3 +1209,5 @@
 #ifdef	EOF	/* stdio.h has been included */
 extern	void	fparsecue(FILE *f, track_t trackp[]);
 #endif
+
+extern void cdr_defaults(char **p_dev_name, int *p_speed, long *p_fifosize, char **p_drv_opts);