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

More small header changes:

Browse Source 
* Remove leading underscores in header preprocessor names
* Regularize names to include directory parts in the file name
* Untabify files
* Update copyright and remove unmaintained cvs $Id$ line

The justification for removing leading underscores comes from a CERTS Secure Coding recommendation: https://www.securecoding.cert.org/confluence/display/cplusplus/DCL32-CPP.+Do+not+declare+or+define+a+reserved+identifier

See also Savannah bug #35745 https://savannah.gnu.org/bugs/?35745
This commit is contained in:
R. Bernstein
2012-03-18 12:02:01 -04:00
committed by rocky
parent 1c41e1c46c
commit 511ad638b1
45 changed files with 961 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/cdio++/cdio.hpp
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2012 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
@@ -21,8 +21,8 @@
* library. Applications use this for anything regarding libcdio.
*/
#ifndef __CDIO_HPP__
#define __CDIO_HPP__
#ifndef CDIO_CDIOPP_HPP_
#define CDIO_CDIOPP_HPP_
#include <cdio/cdio.h>
#include <cdio/audio.h>
@@ -179,4 +179,4 @@ public:
/* Things related to devices. No class or object is needed. */
#include "devices.hpp"
#endif /* __CDIO_HPP__ */
#endif /* CDIO_CDIOPP_HPP_ */

4
include/cdio++/cdtext.hpp
View File

@@ -1,7 +1,5 @@
/*
$Id: cdtext.hpp,v 1.2 2008/03/25 15:59:10 karl Exp $
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008, 2012 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

4
include/cdio++/device.hpp
View File

@@ -1,7 +1,5 @@
/*
$Id: device.hpp,v 1.7 2008/03/25 15:59:10 karl Exp $
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2012 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

19
include/cdio++/devices.hpp
View File

@@ -1,7 +1,5 @@
/*
$Id: devices.hpp,v 1.5 2008/03/25 15:59:10 karl Exp $
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2012 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
@@ -32,7 +30,7 @@
it was DRIVER_UNKNOWN or DRIVER_DEVICE; If this is NULL, we won't
report back the driver used.
*/
void closeTray (const char *psz_drive, /*in/out*/ driver_id_t &driver_id);
void closeTray(const char *psz_drive, /*in/out*/ driver_id_t &driver_id);
/*!
Close media tray in CD drive if there is a routine to do so.
@@ -40,7 +38,7 @@ void closeTray (const char *psz_drive, /*in/out*/ driver_id_t &driver_id);
@param psz_drive the name of CD-ROM to be closed. If omitted or
NULL, we'll scan for a suitable CD-ROM.
*/
void closeTray (const char *psz_drive=(const char *)NULL);
void closeTray(const char *psz_drive=(const char *)NULL);
/*!
Get a string decribing driver_id.
@@ -48,14 +46,14 @@ void closeTray (const char *psz_drive=(const char *)NULL);
@param driver_id the driver you want the description for
@return a sring of driver description
*/
const char *driverDescribe (driver_id_t driver_id);
const char *driverDescribe(driver_id_t driver_id);
/*!
Eject media in CD drive if there is a routine to do so.
If the CD is ejected, object is destroyed.
*/
void ejectMedia (const char *psz_drive);
void ejectMedia(const char *psz_drive);
/*!
Free device list returned by GetDevices
@@ -65,7 +63,7 @@ void ejectMedia (const char *psz_drive);
@see GetDevices
*/
void freeDeviceList (char * device_list[]);
void freeDeviceList(char * device_list[]);
/*!
Return a string containing the default CD device if none is specified.
@@ -96,7 +94,7 @@ char ** getDevices(driver_id_t driver_id=DRIVER_DEVICE);
things up for libcdio as well.
*/
char **getDevices (driver_id_t &driver_id);
char **getDevices(driver_id_t &driver_id);
/*!
Get an array of device names in search_devices that have at least
@@ -129,7 +127,7 @@ char ** getDevices(/*in*/ char* ppsz_search_devices[],
bool b_any=false);
/*! Return true if we Have driver for driver_id */
bool haveDriver (driver_id_t driver_id);
bool haveDriver(driver_id_t driver_id);
/*!
@@ -178,4 +176,3 @@ bool isNero(const char *psz_nrg);
if not a TOC file.
*/
bool isTocFile(const char *psz_toc);

8
include/cdio++/iso9660.hpp
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2006, 2008, 2011, 2012 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
@@ -21,8 +21,8 @@
* library. Applications use this for anything regarding libcdio.
*/
#ifndef __ISO9660_HPP__
#define __ISO9660_HPP__
#ifndef CDIO_ISO9660_HPP_
#define CDIO_ISO9660_HPP_
#include <cdio/iso9660.h>
#include <cdio++/cdio.hpp>
@@ -426,4 +426,4 @@ public:
typedef vector< ISO9660::Stat *> stat_vector_t;
typedef vector <ISO9660::Stat *>::iterator stat_vector_iterator_t;
#endif /* __ISO9660_HPP__ */
#endif /* CDIO_ISO9660_HPP_ */

6
include/cdio/audio.h
View File

@@ -21,8 +21,8 @@
* calls. These control playing of the CD-ROM through its
* line-out jack.
*/
#ifndef __CDIO_AUDIO_H__
#define __CDIO_AUDIO_H__
#ifndef CDIO_AUDIO_H_
#define CDIO_AUDIO_H_
#include <cdio/types.h>
@@ -143,4 +143,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_AUDIO_H__ */
#endif /* CDIO_AUDIO_H_ */

10
include/cdio/bytesex.h
View File

@@ -1,8 +1,6 @@
/*
$Id: bytesex.h,v 1.5 2008/03/25 15:59:08 karl Exp $
Copyright (C) 2000, 2004 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008, 2012 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
@@ -25,8 +23,8 @@
* use glib.h routines instead.
*/
#ifndef __CDIO_BYTESEX_H__
#define __CDIO_BYTESEX_H__
#ifndef CDIO_BYTESEX_H_
#define CDIO_BYTESEX_H_
#include <cdio/types.h>
#include <cdio/bytesex_asm.h> /* also defines CDIO_INLINE */
@@ -208,7 +206,7 @@ from_733 (uint64_t p)
return (UINT32_C(0xFFFFFFFF) & p);
}
#endif /* __CDIO_BYTESEX_H__ */
#endif /* CDIO_BYTESEX_H_ */
/*

6
include/cdio/bytesex_asm.h
View File

@@ -24,8 +24,8 @@
glib.h routines instead.
*/
#ifndef __CDIO_BYTESEX_ASM_H__
#define __CDIO_BYTESEX_ASM_H__
#ifndef CDIO_BYTESEX_ASM_H_
#define CDIO_BYTESEX_ASM_H_
#if !defined(DISABLE_ASM_OPTIMIZE)
#include <cdio/types.h>
@@ -128,7 +128,7 @@ uint16_t uint16_swap_le_be_asm(uint16_t a)
#endif
#endif /* !defined(DISABLE_ASM_OPTIMIZE) */
#endif /* __CDIO_BYTESEX_ASM_H__ */
#endif /* CDIO_BYTESEX_ASM_H_ */
/*

10
include/cdio/cd_types.h
View File

@@ -1,7 +1,5 @@
/*
$Id: cd_types.h,v 1.18 2008/03/25 15:59:08 karl Exp $
Copyright (C) 2003, 2006, 2008 Rocky Bernstein <rocky@cpan.org>
Copyright (C) 2003, 2006, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
and Heiko Ei<45>feldt <heiko@hexco.de>
@@ -25,8 +23,8 @@
*
*/
#ifndef __CDIO_CD_TYPES_H__
#define __CDIO_CD_TYPES_H__
#ifndef CDIO_CD_TYPES_H_
#define CDIO_CD_TYPES_H_
#ifdef __cplusplus
extern "C" {
@@ -164,7 +162,7 @@ cdio_fs_anal_t cdio_guess_cd_type(const CdIo_t *cdio, int start_session,
extern cdio_fs_cap_t debug_cdio_fs_cap;
extern cdio_fs_t debug_cdio_fs;
#endif /* __CDIO_CD_TYPES_H__ */
#endif /* CDIO_CD_TYPES_H_ */
/*
* Local variables:

10
include/cdio/cdtext.h
View File

@@ -1,7 +1,5 @@
/*
$Id: cdtext.h,v 1.14 2008/03/25 15:59:08 karl Exp $
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
adapted from cuetools
Copyright (C) 2003 Svend Sanjay Sorensen <ssorensen@fastmail.fm>
@@ -26,8 +24,8 @@
*/
#ifndef __CDIO_CDTEXT_H__
#define __CDIO_CDTEXT_H__
#ifndef CDIO_CDTEXT_H_
#define CDIO_CDTEXT_H_
#include <cdio/types.h>
@@ -305,7 +303,7 @@ void cdtext_set (cdtext_t *p_cdtext, cdtext_field_t key, const uint8_t *value, t
}
#endif /* __cplusplus */
#endif /* __CDIO_CDTEXT_H__ */
#endif /* CDIO_CDTEXT_H_ */
/*
* Local variables:

6
include/cdio/device.h
View File

@@ -23,8 +23,8 @@
* \brief C header for driver- or device-related libcdio
* calls. ("device" includes CD-image reading devices).
*/
#ifndef __CDIO_DEVICE_H__
#define __CDIO_DEVICE_H__
#ifndef CDIO_DEVICE_H_
#define CDIO_DEVICE_H_
#ifdef __cplusplus
extern "C" {
@@ -1055,4 +1055,4 @@ extern cdio_drive_cap_write_t debug_drive_cap_write_t;
extern cdio_mmc_hw_len_t debug_cdio_mmc_hw_len;
extern cdio_src_category_mask_t debug_cdio_src_category_mask;
#endif /* __CDIO_DEVICE_H__ */
#endif /* CDIO_DEVICE_H_ */

8
include/cdio/disc.h
View File

@@ -1,6 +1,6 @@
/* -*- c -*-
Copyright (C) 2004, 2005, 2006, 2008, 2010 Rocky Bernstein
Copyright (C) 2004, 2005, 2006, 2008, 2010, 2012 Rocky Bernstein
<rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -21,8 +21,8 @@
\file disc.h
\brief The top-level header for disc-related libcdio calls.
*/
#ifndef __CDIO_DISC_H__
#define __CDIO_DISC_H__
#ifndef CDIO_DISC_H_
#define CDIO_DISC_H_
#ifdef __cplusplus
extern "C" {
@@ -134,4 +134,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_DISC_H__ */
#endif /* CDIO_DISC_H_ */

6
include/cdio/ds.h
View File

@@ -26,8 +26,8 @@
*/
#ifndef __CDIO_DS_H__
#define __CDIO_DS_H__
#ifndef CDIO_DS_H_
#define CDIO_DS_H_
#include <cdio/types.h>
@@ -86,7 +86,7 @@ void *_cdio_list_node_data (CdioListNode_t *p_node);
}
#endif /* __cplusplus */
#endif /* __CDIO_DS_H__ */
#endif /* CDIO_DS_H_ */
/*
* Local variables:

6
include/cdio/dvd.h
View File

@@ -27,8 +27,8 @@
*/
#ifndef __CDIO_DVD_H__
#define __CDIO_DVD_H__
#ifndef CDIO_DVD_H_
#define CDIO_DVD_H_
#include <cdio/types.h>
@@ -124,4 +124,4 @@ typedef union {
cdio_dvd_manufact_t manufact;
} cdio_dvd_struct_t;
#endif /* __CDIO_DVD_H__ */
#endif /* CDIO_DVD_H_ */

6
include/cdio/ecma_167.h
View File

@@ -49,8 +49,8 @@
* See http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-167.pdf
*/
#ifndef _ECMA_167_H
#define _ECMA_167_H 1
#ifndef CDIO_ECMA_167_H
#define CDIO_ECMA_167_H 1
#include <cdio/types.h>
@@ -1039,4 +1039,4 @@ extern icbtag_flag_enum_t debug_flag_enum;
extern ecma_167_enum1_t debug_ecma_167_enum1;
extern ecma_167_timezone_enum_t debug_ecma_167_timezone_enum;
#endif /* _ECMA_167_H */
#endif /* CDIO_ECMA_167_H */

10
include/cdio/iso9660.h
View File

@@ -1,7 +1,5 @@
/*
$Id: iso9660.h,v 1.102 2008/07/16 00:28:54 rocky Exp $
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -33,8 +31,8 @@
*/
#ifndef __CDIO_ISO9660_H__
#define __CDIO_ISO9660_H__
#ifndef CDIO_ISO9660_H_
#define CDIO_ISO9660_H_
#include <time.h>
@@ -1133,7 +1131,7 @@ lsn_t iso9660_get_dir_extent(const iso9660_dir_t *p_idr);
#endif /* __cplusplus */
#undef ISODCL
#endif /* __CDIO_ISO9660_H__ */
#endif /* CDIO_ISO9660_H_ */
/*
* Local variables:

10
include/cdio/logging.h
View File

@@ -1,7 +1,5 @@
/*
$Id: logging.h,v 1.11 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2003, 2004, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2004, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -23,8 +21,8 @@
*
*/
#ifndef __LOGGING_H__
#define __LOGGING_H__
#ifndef CDIO_LOGGING_H_
#define CDIO_LOGGING_H_
#include <cdio/types.h>
@@ -124,7 +122,7 @@ void cdio_error (const char format[], ...) GNUC_PRINTF(1,2);
}
#endif
#endif /* __LOGGING_H__ */
#endif /* CDIO_LOGGING_H_ */
/*

8
include/cdio/mmc.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -33,8 +33,8 @@
*/
#ifndef __CDIO_MMC_H__
#define __CDIO_MMC_H__
#ifndef CDIO_MMC_H_
#define CDIO_MMC_H_
#include <cdio/cdio.h>
#include <cdio/types.h>
@@ -800,7 +800,7 @@ extern cdio_mmc_mode_page_t debug_cdio_mmc_mode_page;
CDIO_MMC_GPCMD_PREVENT_ALLOW_MEDIUM_REMOVAL
#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
#endif /* __MMC_H__ */
#endif /* CDIO_MMC_H_ */
/*
* Local variables:

8
include/cdio/mmc_cmds.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 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
@@ -15,14 +15,14 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_MMC_CMDS_H__
#define __CDIO_MMC_CMDS_H__
#ifndef CDIO_MMC_CMDS_H_
#define CDIO_MMC_CMDS_H_
#include <cdio/mmc.h>
#include <cdio/mmc_ll_cmds.h>
#include <cdio/mmc_hl_cmds.h>
#endif /* __CDIO_MMC_CMDS_H__ */
#endif /* CDIO_MMC_CMDS_H_ */
/*
* Local variables:

8
include/cdio/mmc_hl_cmds.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 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
@@ -22,8 +22,8 @@
MMC commands.
*/
#ifndef __CDIO_MMC_HL_CMDS_H__
#define __CDIO_MMC_HL_CMDS_H__
#ifndef CDIO_MMC_HL_CMDS_H_
#define CDIO_MMC_HL_CMDS_H_
#include <cdio/mmc.h>
@@ -121,7 +121,7 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_MMC_HL_CMDS_H__ */
#endif /* CDIO_MMC_HL_CMDS_H_ */
/*
* Local variables:

8
include/cdio/mmc_ll_cmds.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 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
@@ -32,8 +32,8 @@
*/
#ifndef __CDIO_MMC_LL_CMDS_H__
#define __CDIO_MMC_LL_CMDS_H__
#ifndef CDIO_MMC_LL_CMDS_H_
#define CDIO_MMC_LL_CMDS_H_
#include <cdio/mmc.h>
@@ -352,7 +352,7 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_MMC_HL_CMDS_H__ */
#endif /* CDIO_MMC_HL_CMDS_H_ */
/*
* Local variables:

8
include/cdio/mmc_util.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 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
@@ -22,8 +22,8 @@
on anything other than headers.
*/
#ifndef __CDIO_MMC_UTIL_H__
#define __CDIO_MMC_UTIL_H__
#ifndef CDIO_MMC_UTIL_H_
#define CDIO_MMC_UTIL_H_
#include <cdio/device.h>
@@ -147,7 +147,7 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __MMC_UTIL_H__ */
#endif /* CDIO_MMC_UTIL_H_ */
/*
* Local variables:
* c-file-style: "gnu"

10
include/cdio/posix.h
View File

@@ -1,7 +1,5 @@
/*
$Id: posix.h,v 1.2 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008, 2012 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
@@ -22,8 +20,8 @@
* \brief various POSIX definitions.
*/
#ifndef __CDIO_POSIX_H__
#define __CDIO_POSIX_H__
#ifndef CDIO_POSIX_H_
#define CDIO_POSIX_H_
typedef uint32_t posix_mode_t;
typedef uint32_t posix_nlink_t;
@@ -31,7 +29,7 @@ typedef uint32_t posix_uid_t;
typedef uint32_t posix_gid_t;
typedef uint16_t unicode16_t;
#endif /* __CDIO_POSIX_H__ */
#endif /* CDIO_POSIX_H_ */
/*

10
include/cdio/read.h
View File

@@ -1,7 +1,5 @@
/*
$Id: read.h,v 1.15 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2007, 2008, 2012 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
@@ -23,8 +21,8 @@
* libcdio calls.
*/
#ifndef __CDIO_READ_H__
#define __CDIO_READ_H__
#ifndef CDIO_READ_H_
#define CDIO_READ_H_
#include <cdio/types.h>
@@ -223,4 +221,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_TRACK_H__ */
#endif /* CDIO_READ_H_ */

8
include/cdio/rock.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2005, 2006 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006 2008, 2012 Rocky Bernstein <rocky@gnu.org>
See also rock.c by Eric Youngdale (1993) from GNU/Linux
This is Copyright 1993 Yggdrasil Computing, Incorporated
@@ -26,8 +26,8 @@
*/
#ifndef __CDIO_ROCK_H__
#define __CDIO_ROCK_H__
#ifndef CDIO_ROCK_H_
#define CDIO_ROCK_H_
#include <cdio/types.h>
@@ -373,7 +373,7 @@ extern iso_rock_tf_flag_t iso_rock_tf_flag;
}
#endif /* __cplusplus */
#endif /* __ISO_ROCK_H__ */
#endif /* CDIO_ROCK_H_ */
/*
* Local variables:

11
include/cdio/sector.h
View File

@@ -1,7 +1,6 @@
/*
$Id: sector.h,v 1.38 2008/03/25 15:59:09 karl Exp $
Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -57,8 +56,8 @@
*/
#ifndef _CDIO_SECTOR_H_
#define _CDIO_SECTOR_H_
#ifndef CDIO_SECTOR_H_
#define CDIO_SECTOR_H_
#ifdef __cplusplus
extern "C" {
@@ -274,7 +273,7 @@
#define CD_FRAMESIZE_RAW CDIO_CD_FRAMESIZE_RAW
#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
#endif /* _CDIO_SECTOR_H_ */
#endif /* CDIO_SECTOR_H_ */
/*

9
include/cdio/track.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2006, 2008, 2012 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
@@ -18,8 +18,8 @@
/** \file track.h
* \brief The top-level header for track-related libcdio calls.
*/
#ifndef __CDIO_TRACK_H__
#define __CDIO_TRACK_H__
#ifndef CDIO_TRACK_H_
#define CDIO_TRACK_H_
#ifdef __cplusplus
extern "C" {
@@ -250,5 +250,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_TRACK_H__ */
#endif /* CDIO_TRACK_H_ */

6
include/cdio/types.h
View File

@@ -22,8 +22,8 @@
*/
#ifndef __CDIO_TYPES_H__
#define __CDIO_TYPES_H__
#ifndef CDIO_TYPES_H_
#define CDIO_TYPES_H_
#ifdef __cplusplus
extern "C" {
@@ -338,7 +338,7 @@ typedef uint8_t ubyte;
}
#endif /* __cplusplus */
#endif /* __CDIO_TYPES_H__ */
#endif /* CDIO_TYPES_H_ */
/*

6
include/cdio/util.h
View File

@@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_UTIL_H__
#define __CDIO_UTIL_H__
#ifndef CDIO_UTIL_H_
#define CDIO_UTIL_H_
/*!
\file util.h
@@ -129,7 +129,7 @@ char *cdio_realpath (const char *psz_src, char *psz_dst);
}
#endif
#endif /* __CDIO_UTIL_H__ */
#endif /* CDIO_UTIL_H_ */
/*

11
include/cdio/xa.h
View File

@@ -1,7 +1,6 @@
/*
$Id: xa.h,v 1.19 2008/03/25 15:59:10 karl Exp $
Copyright (C) 2003, 2004, 2005, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2004, 2005, 2006, 2008, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
See also iso9660.h by Eric Youngdale (1993) and in cdrtools. These are
@@ -31,8 +30,8 @@
*/
#ifndef __CDIO_XA_H__
#define __CDIO_XA_H__
#ifndef CDIO_XA_H_
#define CDIO_XA_H_
#ifdef __cplusplus
extern "C" {
@@ -168,7 +167,7 @@ extern xa_misc_enum_t debugger_xa_misc_enum;
#endif /* __cplusplus */
#endif /* __CDIO_XA_H__ */
#endif /* CDIO_XA_H_ */
/*
* Local variables:

10
lib/driver/_cdio_stdio.h
View File

@@ -1,7 +1,5 @@
/*
$Id: _cdio_stdio.h,v 1.3 2008/04/22 15:29:11 karl Exp $
Copyright (C) 2003, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2003, 2008, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -19,8 +17,8 @@
*/
#ifndef __CDIO_STDIO_H__
#define __CDIO_STDIO_H__
#ifndef CDIO_STDIO_H_
#define CDIO_STDIO_H_
#include "_cdio_stream.h"
@@ -39,7 +37,7 @@ CdioDataSource_t * cdio_stdio_new(const char psz_path[]);
void cdio_stdio_destroy(CdioDataSource_t *p_obj);
#endif /* __CDIO_STREAM_STDIO_H__ */
#endif /* CDIO_STDIO_H_ */
/*

6
lib/driver/_cdio_stream.h
View File

@@ -18,8 +18,8 @@
*/
#ifndef __CDIO_STREAM_H__
#define __CDIO_STREAM_H__
#ifndef CDIO_STREAM_H_
#define CDIO_STREAM_H_
#include <cdio/types.h>
#include "cdio_private.h"
@@ -126,7 +126,7 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_STREAM_H__ */
#endif /* CDIO_STREAM_H_ */
/*

6
lib/driver/cdio_assert.h
View File

@@ -16,8 +16,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_ASSERT_H__
#define __CDIO_ASSERT_H__
#ifndef CDIO_ASSERT_H_
#define CDIO_ASSERT_H_
#if defined(__GNUC__) && !defined(__MINGW32__)
@@ -55,4 +55,4 @@
#endif
#endif /* __CDIO_ASSERT_H__ */
#endif /* CDIO_ASSERT_H_ */

8
lib/driver/cdio_private.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2003, 2004, 2005, 2008, 2009, 2011
Copyright (C) 2003, 2004, 2005, 2008, 2009, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
@@ -19,8 +19,8 @@
/* Internal routines for CD I/O drivers. */
#ifndef __CDIO_PRIVATE_H__
#define __CDIO_PRIVATE_H__
#ifndef CDIO_DRIVER_PRIVATE_H_
#define CDIO_DRIVER_PRIVATE_H_
#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H)
# include "config.h"
@@ -559,4 +559,4 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_PRIVATE_H__ */
#endif /* CDIO_DRIVER_PRIVATE_H_ */

9
lib/driver/cdtext_private.h
View File

@@ -1,5 +1,6 @@
/*
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2008, 2011, 2012
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
@@ -15,8 +16,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_CDTEXT_PRIVATE_H__
#define __CDIO_CDTEXT_PRIVATE_H__
#ifndef CDIO_DRIVER_CDTEXT_PRIVATE_H_
#define CDIO_DRIVER_CDTEXT_PRIVATE_H_
#include <cdio/types.h>
@@ -136,7 +137,7 @@ cdtext_field_t cdtext_is_field (const char *field);
cdtext_lang_t cdtext_is_language (const char *lang);
#endif /* __CDIO_CDTEXT_PRIVATE_H__ */
#endif /* CDIO_DRIVER_CDTEXT_PRIVATE_H_ */
/*
* Local variables:

8
lib/driver/filemode.h
View File

@@ -1,7 +1,7 @@
/*
filemode.h -- file modes common definitions
Copyright (C) 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2005, 2008, 2011, 2012 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 1985, 1990, 1993, 1998-2000 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -18,8 +18,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __FILEMODE_H__
#define __FILEMODE_H__
#ifndef CDIO_DRIVER_FILEMODE_H_
#define CDIO_DRIVER_FILEMODE_H_
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
@@ -131,4 +131,4 @@
# define S_ISCTG(m) (((m) & S_IFMT) == S_IFCTG)
#endif
#endif /* __FILEMODE_H__ */
#endif /* CDIO_DRIVER_FILEMODE_H_ */

9
lib/driver/generic.h
View File

@@ -1,5 +1,6 @@
/*
Copyright (C) 2004, 2005, 2006, 2008, 2009 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2006, 2008, 2009, 2012
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
@@ -18,8 +19,8 @@
/* Internal routines for CD I/O drivers. */
#ifndef __CDIO_GENERIC_H__
#define __CDIO_GENERIC_H__
#ifndef CDIO_DRIVER_GENERIC_H_
#define CDIO_DRIVER_GENERIC_H_
#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H)
# include "config.h"
@@ -237,7 +238,7 @@ extern "C" {
}
#endif /* __cplusplus */
#endif /* __CDIO_GENERIC_H__ */
#endif /* CDIO_DRIVER_GENERIC_H_ */
/*

9
lib/driver/image.h
View File

@@ -1,5 +1,6 @@
/*
Copyright (C) 2004, 2005, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2008, 2011, 2012
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
@@ -21,8 +22,8 @@
defined before it is included.
*/
#ifndef __CDIO_IMAGE_H__
#define __CDIO_IMAGE_H__
#ifndef CDIO_DRIVER_IMAGE_H_
#define CDIO_DRIVER_IMAGE_H_
#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
# include "config.h"
@@ -76,4 +77,4 @@ typedef struct {
} track_info_t;
#endif /* __CDIO_IMAGE_H__ */
#endif /* CDIO_DRIVER_IMAGE_H_ */

8
lib/driver/image_common.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2004, 2005, 2008 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2004, 2005, 2008, 2012 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
@@ -24,8 +24,8 @@
image.h
*/
#ifndef __CDIO_IMAGE_COMMON_H__
#define __CDIO_IMAGE_COMMON_H__
#ifndef CDIO_DRIVER_IMAGE_COMMON_H_
#define CDIO_DRIVER_IMAGE_COMMON_H_
typedef struct {
/* Things common to all drivers like this.
@@ -202,4 +202,4 @@ read_data_sectors_image ( void *p_user_data, void *p_buf,
*/
int _set_arg_image (void *user_data, const char key[], const char value[]);
#endif /* __CDIO_IMAGE_COMMON_H__ */
#endif /* CDIO_DRIVER_IMAGE_COMMON_H_ */

8
lib/driver/mmc/mmc_cmd_helper.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2010, 2012 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
@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_MMC_CMD_HELPER_H__
#define __CDIO_MMC_CMD_HELPER_H__
#ifndef CDIO_DRIVER_MMC_CMD_HELPER_H_
#define CDIO_DRIVER_MMC_CMD_HELPER_H_
/* Boilerplate initialization code to setup running MMC command. We
assume variables 'p_cdio', 'p_buf', and 'i_size' are previously
@@ -60,4 +60,4 @@
&cdb, \
direction, i_size, p_buf)
#endif /* __CDIO_MMC_CMD_HELPER_H__ */
#endif /* CDIO_DRIVER_MMC_CMD_HELPER_H_ */

6
lib/driver/portable.h
View File

@@ -21,8 +21,8 @@
included other routines can be more portable.
*/
#ifndef __CDIO_PORTABLE_H__
#define __CDIO_PORTABLE_H__
#ifndef CDIO_DRIVER_PORTABLE_H_
#define CDIO_DRIVER_PORTABLE_H_
#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
# include "config.h"
@@ -51,4 +51,4 @@
# define drand48() (rand() / (double)RAND_MAX)
#endif
#endif /* __CDIO_PORTABLE_H__ */
#endif /* CDIO_DRIVER_PORTABLE_H_ */

8
lib/iso9660/iso9660_private.h
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2003, 2004, 2005, 2008, 2011
Copyright (C) 2003, 2004, 2005, 2008, 2011, 2012
Rocky Bernstein <rocky@gnu.org>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -22,8 +22,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_ISO9660_PRIVATE_H__
#define __CDIO_ISO9660_PRIVATE_H__
#ifndef CDIO_ISO9660_ISO9660_PRIVATE_H_
#define CDIO_ISO9660_ISO9660_PRIVATE_H_
#if defined(HAVE_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
# include "config.h"
@@ -71,7 +71,7 @@ typedef struct iso_path_table_s {
PRAGMA_END_PACKED
#endif /* __CDIO_ISO9660_PRIVATE_H__ */
#endif /* CDIO_ISO0660_ISO9660_PRIVATE_H_ */
/*

10
lib/udf/udf_fs.h
View File

@@ -1,7 +1,5 @@
/*
$Id: udf_fs.h,v 1.3 2008/04/18 16:02:10 karl Exp $
Copyright (C) 2006, 2008 Rocky Bernstein <rockyb@gnu.org>
Copyright (C) 2006, 2008, 2012 Rocky Bernstein <rockyb@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
@@ -17,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_UDF_FS_H__
#define __CDIO_UDF_FS_H__
#ifndef CDIO_UDF_UDF_FS_H_
#define CDIO_UDF_UDF_FS_H_
#include <cdio/ecma_167.h>
/**
@@ -27,7 +25,7 @@
*/
int udf_checktag(const udf_tag_t *p_tag, udf_Uint16_t tag_id);
#endif /* __CDIO_UDF_FS_H__ */
#endif /* CDIO_UDF_UDF_FS_H_ */
/*

6
lib/udf/udf_private.h
View File

@@ -15,8 +15,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CDIO_UDF_PRIVATE_H__
#define __CDIO_UDF_PRIVATE_H__
#ifndef CDIO_UDF_UDF_PRIVATE_H_
#define CDIO_UDF_UDF_PRIVATE_H_
#if defined(HAVE_CONFIG_H) && !defined(LIBCDIO_CONFIG_H) && !defined(__CDIO_CONFIG_H__)
# include "config.h"
@@ -43,7 +43,7 @@ struct udf_s {
uint32_t fsd_offset; /* lba of fileset descriptor */
};
#endif /* __CDIO_UDF_PRIVATE_H__ */
#endif /* CDIO_UDF_UDF_PRIVATE_H_ */
/*

14
src/getopt.h
View File

@@ -19,8 +19,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
#ifndef _GETOPT_H
#define _GETOPT_H 1
#ifndef CDIO_SRC_GETOPT_H
#define CDIO_SRC_GETOPT_H 1
#ifdef __cplusplus
extern "C" {
@@ -119,15 +119,15 @@ extern int _getopt_internal (int argc, char *const *argv,
const struct option *longopts, int *longind,
int long_only);
#else /* not __STDC__ */
extern int getopt ();
extern int getopt_long ();
extern int getopt_long_only ();
extern int getopt();
extern int getopt_long();
extern int getopt_long_only();
extern int _getopt_internal ();
extern int _getopt_internal();
#endif /* __STDC__ */
#ifdef __cplusplus
}
#endif
#endif /* getopt.h */
#endif /* CDIO_SRC_GETOPT_H */