Remove CVS $Id$ line which is no longer automatically updated.
ios9660.hpp under FS because of Solaris macro conflict as suggested by Thomas Schmitt. cd-drive.c: add some casts to remove gcc warnings src/cd-paranoia/Makefile.am: remove a GNU make idiom. README.develop: note needing GNU make or remake
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
Software you'll need to build a development version libcdio
|
||||
- git
|
||||
- GNU make (or even better "remake")
|
||||
- autoconf (which contains programs autoconf and autoreconf)
|
||||
- automake
|
||||
- libtool (for building shared libraries)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/*
|
||||
$Id: sample3.c,v 1.10 2008/03/24 15:30:56 karl Exp $
|
||||
|
||||
Copyright (C) 2003, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
|
||||
Copyright (C) 2003, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
/*
|
||||
$Id: iso9660.hpp,v 1.13 2008/06/13 15:58:50 flameeyes Exp $
|
||||
|
||||
Copyright (C) 2006, 2008 Rocky Bernstein <rocky@gnu.org>
|
||||
Copyright (C) 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@@ -148,6 +146,9 @@ public:
|
||||
|
||||
};
|
||||
|
||||
#ifdef FS
|
||||
#undef FS
|
||||
#endif
|
||||
class FS : public CdioDevice // ISO 9660 Filesystem on a CD or CD-image
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
/*
|
||||
$Id: cd-drive.c,v 1.29 2008/06/19 15:44:10 flameeyes Exp $
|
||||
|
||||
Copyright (C) 2011 Rocky Bernstein <rocky@gnu.org>
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
@@ -15,7 +14,7 @@
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/* Program to show drivers installed and capibilites of CD drives. */
|
||||
/* Program to show drivers installed and capabilities of CD drives. */
|
||||
|
||||
#include "util.h"
|
||||
|
||||
@@ -95,7 +94,7 @@ parse_options (int argc, char *argv[])
|
||||
break;
|
||||
|
||||
case 'i':
|
||||
if (opts.source_image != DRIVER_UNKNOWN) {
|
||||
if (opts.source_image != (source_image_t) DRIVER_UNKNOWN) {
|
||||
/* NOTE: The libpopt version already set source_name by this time.
|
||||
To restore this behavior, fall through to the else{} block.
|
||||
*/
|
||||
@@ -153,7 +152,7 @@ parse_options (int argc, char *argv[])
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (opts.source_image == DRIVER_DEVICE)
|
||||
if (opts.source_image == (source_image_t) DRIVER_DEVICE)
|
||||
source_name = fillout_device_name(remaining_arg);
|
||||
else
|
||||
source_name = strdup(remaining_arg);
|
||||
|
||||
@@ -47,7 +47,7 @@ cd-paranoia.$(OBJEXT): usage.h
|
||||
|
||||
if HAVE_PERL
|
||||
usage.h: usage.txt $(srcdir)/pod2c.pl
|
||||
$(PERL) $(srcdir)/pod2c.pl usage.txt >$@
|
||||
$(PERL) $(srcdir)/pod2c.pl usage.txt >usage.h
|
||||
else
|
||||
usage.h: usage-copy.h
|
||||
cp usage-copy.h $@
|
||||
|
||||
6
test/check_legal.regex
Normal file
6
test/check_legal.regex
Normal file
@@ -0,0 +1,6 @@
|
||||
cd-info version [0-9]
|
||||
^Copyright (c) 2003
|
||||
Bernstein
|
||||
^This is free software; see the source for copying conditions\.$
|
||||
^There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A$
|
||||
^PARTICULAR PURPOSE\.$
|
||||
Reference in New Issue
Block a user