[Debburn-changes] r374 - nonameyet/branches/experimental/cdrecord
Eduard Bloch
blade at costa.debian.org
Thu Oct 26 00:14:34 CEST 2006
Author: blade
Date: 2006-10-25 22:14:33 +0000 (Wed, 25 Oct 2006)
New Revision: 374
Modified:
nonameyet/branches/experimental/cdrecord/cdrecord.c
nonameyet/branches/experimental/cdrecord/cdrecord.h
Log:
small fixes and adaptions, the big pile is still ahead
Modified: nonameyet/branches/experimental/cdrecord/cdrecord.c
===================================================================
--- nonameyet/branches/experimental/cdrecord/cdrecord.c 2006-10-25 21:22:20 UTC (rev 373)
+++ nonameyet/branches/experimental/cdrecord/cdrecord.c 2006-10-25 22:14:33 UTC (rev 374)
@@ -129,7 +129,6 @@
int data_secs_per_tr; /* # of data secs per transfer */
int audio_secs_per_tr; /* # of audio secs per transfer */
-BOOL isgui;
int didintr;
struct timeval starttime;
@@ -179,13 +178,16 @@
static int rt_raisepri (int);
#endif
extern void raisepri (int);
-static void checkgui (void);
static char * astoll (const char *s, Llong *ll);
static Llong number (char* arg, int* retp);
extern int getnum (char* arg, long* valp);
extern int getllnum (char *arg, Llong* lvalp);
static int getbltype (char* optstr, long *typep);
+/* provided by libschily and others nowadays */
+
+static char * astoll(register const char *s, Llong *ll);
+
extern int
main(ac, av)
int ac;
@@ -228,7 +230,6 @@
if (flags & F_VERSION)
exit(0);
- checkgui();
if (debug || lverbose) {
printf("TOC Type: %d = %s\n",
@@ -755,8 +756,7 @@
}
static void
-blusage(ret)
- int ret;
+blusage(int ret)
{
error("Blanking options:\n");
error("\tall\t\tblank the entire disk\n");
@@ -808,14 +808,9 @@
return (amount);
}
-extern int
-get_buf(f, bpp, size)
- int f;
- char **bpp;
- int size;
-{
+extern int get_buf (int f, char **bpp, int size) {
if (fs > 0) {
-/* return (faio_read_buf(f, *bpp, size));*/
+ /* return (faio_read_buf(f, *bpp, size));*/
return (faio_get_buf(f, bpp, size));
} else {
return (read_buf(f, *bpp, size));
@@ -2085,11 +2080,9 @@
adr, control, mode);
}
-static void
-prtimediff(fmt, start, stop)
- const char *fmt;
- struct timeval *start;
- struct timeval *stop;
+static void prtimediff (const char *fmt,
+ struct timeval *start,
+ struct timeval *stop)
{
struct timeval tv;
@@ -2270,31 +2263,7 @@
#endif /* HAVE_SYS_PRIOCNTL_H */
-static void
-checkgui()
-{
- struct stat st;
- if (fstat(STDERR_FILENO, &st) >= 0 && !S_ISCHR(st.st_mode)) {
- isgui = TRUE;
- if (lverbose > 1)
- printf("Using remote (pipe) mode for interactive i/o.\n");
- }
-}
-
-static char *
-astoll(s, ll)
- register const char *s;
- Llong *ll;
-{
- char *p;
- long l = 0;
-
- p = astol(s, &l);
- *ll = (Llong)l;
- return (p);
-}
-
static Llong
number(arg, retp)
register char *arg;
Modified: nonameyet/branches/experimental/cdrecord/cdrecord.h
===================================================================
--- nonameyet/branches/experimental/cdrecord/cdrecord.h 2006-10-25 21:22:20 UTC (rev 373)
+++ nonameyet/branches/experimental/cdrecord/cdrecord.h 2006-10-25 22:14:33 UTC (rev 374)
@@ -439,6 +439,8 @@
#define DB_VU_7 7 /* - Vendor specific */
#define DB_ROM_MODE1 8 /* 2048 bytes Mode 1 (ISO/IEC 10149) */
#define DB_ROM_MODE2 9 /* 2336 bytes Mode 2 (ISO/IEC 10149) */
+#warning FIXME: find out what DB_XA_MODE1 was exactly good for
+#define DB_XA_MODE1 10 /* 2048 bytes Mode 1? (CD-ROM XA form 1) */
#define DB_XA_MODE2 10 /* 2048 bytes Mode 2 (CD-ROM XA form 1) */
#define DB_XA_MODE2_F1 11 /* 2056 bytes Mode 2 (CD-ROM XA form 1) */
#define DB_XA_MODE2_F2 12 /* 2324 bytes Mode 2 (CD-ROM XA form 2) */
@@ -850,16 +852,18 @@
*/
extern int read_buf(int f, char *bp, int size);
extern int fill_buf(int f, track_t *trackp, long secno, char *bp, int size);
-extern int get_buf(int f, track_t *trackp, long secno, char **bpp, int size);
+/*extern int get_buf(int f, track_t *trackp, long secno, char **bpp, int size);
+*/
#ifdef _SCG_SCSITRANSP_H
extern int write_secs(SCSI *scgp, cdr_t *dp, char *bp, long startsec,
int bytespt, int secspt, BOOL islast);
-extern int pad_track(SCSI *scgp, cdr_t *dp, track_t *trackp,
+/*extern int pad_track(SCSI *scgp, cdr_t *dp, track_t *trackp,
long startsec, Llong amt,
BOOL dolast, Llong *bytesp);
extern void load_media(SCSI *scgp, cdr_t *, BOOL);
extern void unload_media(SCSI *scgp, cdr_t *, int);
extern void reload_media(SCSI *scgp, cdr_t *);
+*/
#endif
extern void raisepri(int);
extern int getnum(char *arg, long *valp);
@@ -925,8 +929,9 @@
*/
#ifdef timerclear
extern void timevaldiff(struct timeval *start, struct timeval *stop);
-extern void prtimediff(const char *fmt, struct timeval *start,
+/*extern void prtimediff(const char *fmt, struct timeval *start,
struct timeval *stop);
+*/
#endif
/*
More information about the Debburn-changes
mailing list