[Pcsclite-cvs-commit] r5434 - in /trunk/PCSC/src: PCSC/debuglog.h PCSC/ifdhandler.h atrhandler.h dyn_generic.h eventhandler.h hotplug.h ifdwrapper.h misc.h parser.h powermgt_generic.h prothandler.h readerfactory.h sys_generic.h winscard_msg.h winscard_svc.h
rousseau at users.alioth.debian.org
rousseau at users.alioth.debian.org
Wed Dec 8 14:13:28 UTC 2010
Author: rousseau
Date: Wed Dec 8 14:13:21 2010
New Revision: 5434
URL: http://svn.debian.org/wsvn/pcsclite/?sc=1&rev=5434
Log:
Do not use extern "C" since we are in C and not C++
Follow rule 13 of "On C Library Implementation" by Rusty Russell
http://rusty.ozlabs.org/?p=140
Modified:
trunk/PCSC/src/PCSC/debuglog.h
trunk/PCSC/src/PCSC/ifdhandler.h
trunk/PCSC/src/atrhandler.h
trunk/PCSC/src/dyn_generic.h
trunk/PCSC/src/eventhandler.h
trunk/PCSC/src/hotplug.h
trunk/PCSC/src/ifdwrapper.h
trunk/PCSC/src/misc.h
trunk/PCSC/src/parser.h
trunk/PCSC/src/powermgt_generic.h
trunk/PCSC/src/prothandler.h
trunk/PCSC/src/readerfactory.h
trunk/PCSC/src/sys_generic.h
trunk/PCSC/src/winscard_msg.h
trunk/PCSC/src/winscard_svc.h
Modified: trunk/PCSC/src/PCSC/debuglog.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/debuglog.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/debuglog.h (original)
+++ trunk/PCSC/src/PCSC/debuglog.h Wed Dec 8 14:13:21 2010
@@ -32,11 +32,6 @@
#ifndef __debuglog_h__
#define __debuglog_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
#ifndef PCSC_API
#define PCSC_API
@@ -109,9 +104,5 @@
void DebugLogCategory(const int, const unsigned char *, const int);
PCSC_API void DebugLogSetLevel(const int level);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __debuglog_h__ */
Modified: trunk/PCSC/src/PCSC/ifdhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/PCSC/ifdhandler.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/PCSC/ifdhandler.h (original)
+++ trunk/PCSC/src/PCSC/ifdhandler.h Wed Dec 8 14:13:21 2010
@@ -230,11 +230,6 @@
#define _ifd_handler_h_
#include <pcsclite.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
/*
* List of data structures available to ifdhandler
@@ -781,8 +776,4 @@
*/
RESPONSECODE IFDHICCPresence(DWORD Lun);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/atrhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/atrhandler.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/atrhandler.h (original)
+++ trunk/PCSC/src/atrhandler.h Wed Dec 8 14:13:21 2010
@@ -17,11 +17,6 @@
#ifndef __atrhandler_h__
#define __atrhandler_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
#define SCARD_CONVENTION_DIRECT 0x0001
#define SCARD_CONVENTION_INVERSE 0x0002
@@ -55,8 +50,4 @@
short ATRDecodeAtr(/*@out@*/ SMARTCARD_EXTENSION *psExtension,
PUCHAR pucAtr, DWORD dwLength);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __atrhandler_h__ */
Modified: trunk/PCSC/src/dyn_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/dyn_generic.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/dyn_generic.h (original)
+++ trunk/PCSC/src/dyn_generic.h Wed Dec 8 14:13:21 2010
@@ -17,17 +17,8 @@
#ifndef __dyn_generic_h__
#define __dyn_generic_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
int DYN_LoadLibrary(void **, char *);
int DYN_CloseLibrary(void **);
int DYN_GetAddress(void *, /*@out@*/ void **, const char *);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/eventhandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/eventhandler.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/eventhandler.h (original)
+++ trunk/PCSC/src/eventhandler.h Wed Dec 8 14:13:21 2010
@@ -19,11 +19,6 @@
#define __eventhandler_h__
#include <stdint.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
/**
* Define an exported public reader state structure so each
@@ -62,8 +57,4 @@
* ready and the (possible) card has been powered up */
#define READER_NOT_INITIALIZED (MAX_ATR_SIZE+1)
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __eventhandler_h__ */
Modified: trunk/PCSC/src/hotplug.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/hotplug.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/hotplug.h (original)
+++ trunk/PCSC/src/hotplug.h Wed Dec 8 14:13:21 2010
@@ -17,11 +17,6 @@
#ifndef __hotplug_h__
#define __hotplug_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
#ifndef PCSCLITE_HP_DROPDIR
#define PCSCLITE_HP_DROPDIR "/usr/local/pcsc/drivers/"
#endif
@@ -40,8 +35,4 @@
LONG HPStopHotPluggables(void);
void HPReCheckSerialReaders(void);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/ifdwrapper.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/ifdwrapper.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/ifdwrapper.h (original)
+++ trunk/PCSC/src/ifdwrapper.h Wed Dec 8 14:13:21 2010
@@ -18,11 +18,6 @@
#ifndef __ifdwrapper_h__
#define __ifdwrapper_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
LONG IFDOpenIFD(READER_CONTEXT *);
LONG IFDCloseIFD(READER_CONTEXT *);
LONG IFDPowerICC(READER_CONTEXT *, DWORD, PUCHAR, /*@out@*/ PDWORD);
@@ -37,8 +32,4 @@
LONG IFDSetCapabilities(READER_CONTEXT *, DWORD, DWORD, PUCHAR);
LONG IFDGetCapabilities(READER_CONTEXT *, DWORD, PDWORD, /*@out@*/ PUCHAR);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __ifdwrapper_h__ */
Modified: trunk/PCSC/src/misc.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/misc.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/misc.h (original)
+++ trunk/PCSC/src/misc.h Wed Dec 8 14:13:21 2010
@@ -11,11 +11,6 @@
#ifndef __misc_h__
#define __misc_h__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
/*
* Declare the function as internal to the library: the function name is
@@ -60,8 +55,4 @@
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __misc_h__ */
Modified: trunk/PCSC/src/parser.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/parser.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/parser.h (original)
+++ trunk/PCSC/src/parser.h Wed Dec 8 14:13:21 2010
@@ -17,11 +17,6 @@
#ifndef __parser_h__
#define __parser_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
#include "simclist.h"
struct bundleElt
@@ -34,8 +29,4 @@
int bundleParse(const char *fileName, list_t *l);
void bundleRelease(list_t *l);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/powermgt_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/powermgt_generic.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/powermgt_generic.h (original)
+++ trunk/PCSC/src/powermgt_generic.h Wed Dec 8 14:13:21 2010
@@ -15,20 +15,9 @@
#ifndef __powermgt_generic_h__
#define __powermgt_generic_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
/**
* Registers for Power Management callbacks
*/
ULONG PMRegisterForPowerEvents(void);
-
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/prothandler.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/prothandler.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/prothandler.h (original)
+++ trunk/PCSC/src/prothandler.h Wed Dec 8 14:13:21 2010
@@ -17,11 +17,6 @@
#ifndef __prothandler_h__
#define __prothandler_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
UCHAR PHGetDefaultProtocol(PUCHAR, DWORD);
UCHAR PHGetAvailableProtocols(PUCHAR, DWORD);
DWORD PHSetProtocol(struct ReaderContext *, DWORD, UCHAR, UCHAR);
@@ -29,8 +24,4 @@
#define SET_PROTOCOL_WRONG_ARGUMENT -1
#define SET_PROTOCOL_PPS_FAILED -2
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __prothandler_h__ */
Modified: trunk/PCSC/src/readerfactory.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/readerfactory.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/readerfactory.h (original)
+++ trunk/PCSC/src/readerfactory.h Wed Dec 8 14:13:21 2010
@@ -23,11 +23,6 @@
#include "ifdhandler.h"
#include "pcscd.h"
#include "simclist.h"
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
typedef struct
{
@@ -154,8 +149,4 @@
int RFStartSerialReaders(const char *readerconf);
void RFReCheckReaderConf(void);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/sys_generic.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/sys_generic.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/sys_generic.h (original)
+++ trunk/PCSC/src/sys_generic.h Wed Dec 8 14:13:21 2010
@@ -17,11 +17,6 @@
#ifndef __sys_generic_h__
#define __sys_generic_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
#include <sys/stat.h>
#include <sys/mman.h>
@@ -35,8 +30,4 @@
int SYS_GetSeed(void);
-#ifdef __cplusplus
-}
-#endif
-
#endif /* __sys_generic_h__ */
Modified: trunk/PCSC/src/winscard_msg.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_msg.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_msg.h (original)
+++ trunk/PCSC/src/winscard_msg.h Wed Dec 8 14:13:21 2010
@@ -26,11 +26,6 @@
#define PROTOCOL_VERSION_MAJOR 4
/** Minor version of the current message protocol */
#define PROTOCOL_VERSION_MINOR 2
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
/**
* @brief Information transmitted in \ref CMD_VERSION Messages.
@@ -271,8 +266,4 @@
LONG MessageReceive(/*@out@*/ void *buffer, uint64_t buffer_size,
int32_t filedes);
-#ifdef __cplusplus
-}
#endif
-
-#endif
Modified: trunk/PCSC/src/winscard_svc.h
URL: http://svn.debian.org/wsvn/pcsclite/trunk/PCSC/src/winscard_svc.h?rev=5434&op=diff
==============================================================================
--- trunk/PCSC/src/winscard_svc.h (original)
+++ trunk/PCSC/src/winscard_svc.h Wed Dec 8 14:13:21 2010
@@ -20,16 +20,9 @@
#ifndef __winscard_svc_h__
#define __winscard_svc_h__
-#ifdef __cplusplus
-extern "C"
-{
-#endif
LONG ContextsInitialize(int, int);
void ContextsDeinitialize(void);
LONG CreateContextThread(uint32_t *);
LONG MSGSignalClient(uint32_t filedes, LONG rv);
-#ifdef __cplusplus
-}
-#endif
#endif
More information about the Pcsclite-cvs-commit
mailing list