claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

More #define reductions/fixes.

Browse Source
This commit is contained in:
rocky
2003-04-06 18:12:37 +00:00
parent 797d0c3c98
commit 1844e64bfb
5 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/*
$Id: _cdio_linux.c,v 1.6 2003/04/06 17:57:20 rocky Exp $
$Id: _cdio_linux.c,v 1.7 2003/04/06 18:12:37 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h"
#endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.6 2003/04/06 17:57:20 rocky Exp $";
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.7 2003/04/06 18:12:37 rocky Exp $";
#include "cdio_assert.h"
#include "cdio_private.h"
@@ -280,7 +280,7 @@ _cdio_read_mode2_sector (void *user_data, void *data, lsn_t lsn,
if (mode2_form2)
memcpy (data, buf, M2RAW_SECTOR_SIZE);
else
memcpy (((char *)data), buf + 8, FORM1_DATA_SIZE);
memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
return 0;
}
@@ -310,8 +310,8 @@ _cdio_read_mode2_sectors (void *user_data, void *data, lsn_t lsn,
if ( (retval = _cdio_read_mode2_sector (_obj, buf, lsn + i, true)) )
return retval;
memcpy (((char *)data) + (FORM1_DATA_SIZE * i), buf + 8,
FORM1_DATA_SIZE);
memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i),
buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
}
}
return 0;