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

Small lint-like errors. Solaris now works again with new read/lseek

Browse Source 
functions.
This commit is contained in:
rocky
2003-03-29 21:13:55 +00:00
parent 4b1e1307ea
commit 60e9f15876
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/_cdio_bincue.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bincue.c,v 1.2 2003/03/29 17:32:00 rocky Exp $ $Id: _cdio_bincue.c,v 1.3 2003/03/29 21:13:55 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -28,7 +28,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.2 2003/03/29 17:32:00 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_bincue.c,v 1.3 2003/03/29 21:13:55 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@@ -173,6 +173,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
user_datasize=FORM1_DATA_SIZE; user_datasize=FORM1_DATA_SIZE;
break; break;
default: default:
user_datasize=CD_RAW_SECTOR_SIZE;
cdio_warn ("track %d has unknown format %d", cdio_warn ("track %d has unknown format %d",
i+1, this_track->track_format); i+1, this_track->track_format);
} }

5
lib/_cdio_generic.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 rocky Exp $ $Id: _cdio_generic.c,v 1.2 2003/03/29 21:13:55 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.2 2003/03/29 21:13:55 rocky Exp $";
#include "cdio_assert.h" #include "cdio_assert.h"
#include "cdio_private.h" #include "cdio_private.h"
@@ -41,7 +41,6 @@ static const char _rcsid[] = "$Id: _cdio_generic.c,v 1.1 2003/03/29 17:32:00 roc
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/cdrom.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

5
lib/_cdio_nrg.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_nrg.c,v 1.2 2003/03/29 17:32:00 rocky Exp $ $Id: _cdio_nrg.c,v 1.3 2003/03/29 21:13:55 rocky Exp $
Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -38,7 +38,7 @@
#include "util.h" #include "util.h"
#include "_cdio_stdio.h" #include "_cdio_stdio.h"
static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.2 2003/03/29 17:32:00 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.3 2003/03/29 21:13:55 rocky Exp $";
/* structures used */ /* structures used */
@@ -530,6 +530,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
user_datasize=FORM1_DATA_SIZE; user_datasize=FORM1_DATA_SIZE;
break; break;
default: default:
user_datasize=CD_RAW_SECTOR_SIZE;
cdio_warn ("track %d has unknown format %d", cdio_warn ("track %d has unknown format %d",
i+1, this_track->track_format); i+1, this_track->track_format);
} }

14
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.3 2003/03/29 20:28:05 rocky Exp $ $Id: _cdio_sunos.c,v 1.4 2003/03/29 21:13:55 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -31,7 +31,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.3 2003/03/29 20:28:05 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.4 2003/03/29 21:13:55 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -95,11 +95,11 @@ _cdio_init (_img_private_t *_obj)
struct dk_cinfo cinfo; struct dk_cinfo cinfo;
_obj->gen.fd = open (_obj->source_name, O_RDONLY, 0); _obj->gen.fd = open (_obj->gen.source_name, O_RDONLY, 0);
if (_obj->gen.fd < 0) if (_obj->gen.fd < 0)
{ {
cdio_error ("open (%s): %s", _obj->source_name, strerror (errno)); cdio_error ("open (%s): %s", _obj->gen.source_name, strerror (errno));
return false; return false;
} }
@@ -306,9 +306,9 @@ _cdio_set_arg (void *user_data, const char key[], const char value[])
if (!value) if (!value)
return -2; return -2;
free (_obj->source_name); free (_obj->gen.source_name);
_obj->source_name = strdup (value); _obj->gen.source_name = strdup (value);
} }
else if (!strcmp (key, "access-mode")) else if (!strcmp (key, "access-mode"))
{ {
@@ -416,7 +416,7 @@ _cdio_get_arg (void *user_data, const char key[])
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
if (!strcmp (key, "source")) { if (!strcmp (key, "source")) {
return _obj->source_name; return _obj->gen.source_name;
} else if (!strcmp (key, "access-mode")) { } else if (!strcmp (key, "access-mode")) {
switch (_obj->access_mode) { switch (_obj->access_mode) {
case _AM_SUN_CTRL_ATAPI: case _AM_SUN_CTRL_ATAPI: