Skip to content

Commit

Permalink
Remove spaces and tabs at end of line
Browse files Browse the repository at this point in the history
git-svn-id: svn:https://anonscm.debian.org/svn/pcsclite/trunk/PCSC@5343 0ce88b0d-b2fd-0310-8134-9614164e65ea
  • Loading branch information
LudovicRousseau committed Oct 22, 2010
1 parent 4e80ea5 commit bb21e05
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions src/eventhandler.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ LONG EHRegisterClientForEvent(int32_t filedes)
(void)pthread_mutex_lock(&ClientsWaitingForEvent_lock);

(void)list_append(&ClientsWaitingForEvent, &filedes);

(void)pthread_mutex_unlock(&ClientsWaitingForEvent_lock);

return SCARD_S_SUCCESS;
Expand All @@ -67,9 +67,9 @@ LONG EHTryToUnregisterClientForEvent(int32_t filedes)
(void)pthread_mutex_lock(&ClientsWaitingForEvent_lock);

ret = list_delete(&ClientsWaitingForEvent, &filedes);

(void)pthread_mutex_unlock(&ClientsWaitingForEvent_lock);

if (ret < 0)
rv = SCARD_F_INTERNAL_ERROR;

Expand All @@ -82,7 +82,7 @@ LONG EHTryToUnregisterClientForEvent(int32_t filedes)
LONG EHUnregisterClientForEvent(int32_t filedes)
{
LONG rv = EHTryToUnregisterClientForEvent(filedes);

if (rv < 0)
Log2(PCSC_LOG_ERROR, "Can't remove client: %d", filedes);

Expand Down Expand Up @@ -252,7 +252,7 @@ static void EHStatusHandlerThread(READER_CONTEXT * rContext)
if (dwStatus & SCARD_PRESENT)
{
#ifdef DISABLE_AUTO_POWER_ON
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
readerState = SCARD_PRESENT;
Log1(PCSC_LOG_INFO, "Skip card power on");
Expand Down Expand Up @@ -359,7 +359,7 @@ static void EHStatusHandlerThread(READER_CONTEXT * rContext)
dwCurrentState == SCARD_UNKNOWN)
{
#ifdef DISABLE_AUTO_POWER_ON
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardProtocol = SCARD_PROTOCOL_UNDEFINED;
rContext->readerState->readerState = SCARD_PRESENT;
rContext->powerState = POWER_STATE_UNPOWERED;
Expand Down
2 changes: 1 addition & 1 deletion src/eventhandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern "C"

LONG EHTryToUnregisterClientForEvent(int32_t filedes);
LONG EHRegisterClientForEvent(int32_t filedes);
LONG EHUnregisterClientForEvent(int32_t filedes);
LONG EHUnregisterClientForEvent(int32_t filedes);
LONG EHSignalEventToClients(void);
LONG EHInitializeEventStructures(void);
LONG EHSpawnEventHandler(READER_CONTEXT *);
Expand Down
2 changes: 1 addition & 1 deletion src/hotplug_libhal.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ static void HPAddDevice(LibHalContext *ctx, const char *udi)
sSerialNumber = libhal_device_get_property_string(ctx, udi,
"usb.serial", NULL);
#endif

/* name from the Info.plist file */
strlcpy(fullname, driver->readerName, sizeof(fullname));

Expand Down
2 changes: 1 addition & 1 deletion src/hotplug_macosx.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Copyright (C) 2002
* David Corcoran <[email protected]>
* Copyright (C) 2003
* Antti Tapaninen
* Antti Tapaninen
*
* $Id$
*/
Expand Down
2 changes: 1 addition & 1 deletion src/ifdwrapper.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ LONG IFDSetPTS(READER_CONTEXT * rContext, DWORD dwProtocol, UCHAR ucFlags,
dwProtocol, ucFlags, ucPTS1, ucPTS2, ucPTS3);
#else
rv = IFDHSetProtocolParameters(rContext->slot, dwProtocol, ucFlags,
ucPTS1, ucPTS2, ucPTS3);
ucPTS1, ucPTS2, ucPTS3);
#endif

return rv;
Expand Down
2 changes: 1 addition & 1 deletion src/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ extern "C"
#if defined __GNUC__ && (! defined (__sun)) && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
#define INTERNAL __attribute__ ((visibility("hidden")))
#define PCSC_API __attribute__ ((visibility("default")))
#elif (! defined __GNUC__ ) && defined (__sun)
#elif (! defined __GNUC__ ) && defined (__sun)
/* http:https://wikis.sun.com/display/SunStudio/Macros+for+Shared+Library+Symbol+Visibility */
#define INTERNAL __hidden
#define PCSC_API __global
Expand Down
6 changes: 3 additions & 3 deletions src/pcscdaemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -269,23 +269,23 @@ int main(int argc, char **argv)
break;

case 't':
customMaxThreadCounter = optarg ? atoi(optarg) : 0;
customMaxThreadCounter = optarg ? atoi(optarg) : 0;
if (limited_rights && (customMaxThreadCounter < PCSC_MAX_CONTEXT_THREADS))
customMaxThreadCounter = PCSC_MAX_CONTEXT_THREADS;
Log2(PCSC_LOG_INFO, "setting customMaxThreadCounter to: %d",
customMaxThreadCounter);
break;

case 'r':
customMaxReaderHandles = optarg ? atoi(optarg) : 0;
customMaxReaderHandles = optarg ? atoi(optarg) : 0;
if (limited_rights && (customMaxReaderHandles < PCSC_MAX_READER_HANDLES))
customMaxReaderHandles = PCSC_MAX_READER_HANDLES;
Log2(PCSC_LOG_INFO, "setting customMaxReaderHandles to: %d",
customMaxReaderHandles);
break;

case 's':
customMaxThreadCardHandles = optarg ? atoi(optarg) : 0;
customMaxThreadCardHandles = optarg ? atoi(optarg) : 0;
if (limited_rights && (customMaxThreadCardHandles < PCSC_MAX_CONTEXT_CARD_HANDLES))
customMaxThreadCardHandles = PCSC_MAX_CONTEXT_CARD_HANDLES;
Log2(PCSC_LOG_INFO, "setting customMaxThreadCardHandles to: %d",
Expand Down
4 changes: 2 additions & 2 deletions src/winscard.c
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@ LONG SCardDisconnect(SCARDHANDLE hCard, DWORD dwDisposition)
#ifdef DISABLE_AUTO_POWER_ON
if (SCARD_UNPOWER_CARD == dwDisposition)
{
rContext->readerState->cardAtrLength = 0;
rContext->readerState->cardAtrLength = 0;
rContext->readerState->readerState = SCARD_PRESENT;
Log1(PCSC_LOG_INFO, "Skip card power on");
}
Expand Down Expand Up @@ -1354,7 +1354,7 @@ LONG SCardGetAttrib(SCARDHANDLE hCard, DWORD dwAttrId,
}

}
else
else
rv = SCARD_E_UNSUPPORTED_FEATURE;
break;
case IFD_ERROR_INSUFFICIENT_BUFFER:
Expand Down
12 changes: 6 additions & 6 deletions src/winscard_clnt.c
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ static LONG SCardEstablishContextTH(DWORD dwScope,
Log1(PCSC_LOG_INFO, "Disable shared blocking");
sharing_shall_block = FALSE;
}

isExecuted = 1;
}

Expand Down Expand Up @@ -998,7 +998,7 @@ LONG SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode,

/* Retry loop for blocking behaviour */
retry:

scReconnectStruct.hCard = hCard;
scReconnectStruct.dwShareMode = dwShareMode;
scReconnectStruct.dwPreferredProtocols = dwPreferredProtocols;
Expand Down Expand Up @@ -1034,7 +1034,7 @@ LONG SCardReconnect(SCARDHANDLE hCard, DWORD dwShareMode,
(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
goto retry;
}

*pdwActiveProtocol = scReconnectStruct.dwActiveProtocol;

end:
Expand Down Expand Up @@ -1577,7 +1577,7 @@ LONG SCardStatus(SCARDHANDLE hCard, LPSTR mszReaderName,
(void)SYS_USleep(PCSCLITE_LOCK_POLL_RATE);
goto retry;
}

if (rv != SCARD_S_SUCCESS && rv != SCARD_E_INSUFFICIENT_BUFFER)
{
/*
Expand Down Expand Up @@ -1851,7 +1851,7 @@ LONG SCardGetStatusChange(SCARDCONTEXT hContext, DWORD dwTimeout,
const char *readerName;
int i;

/* Looks for correct readernames */
/* Looks for correct readernames */
readerName = currReader->szReader;
for (i = 0; i < PCSCLITE_MAX_READERS_CONTEXTS; i++)
{
Expand Down Expand Up @@ -2771,7 +2771,7 @@ LONG SCardTransmit(SCARDHANDLE hCard, const SCARD_IO_REQUEST *pioSendPci,

/* Retry loop for blocking behaviour */
retry:

scTransmitStruct.hCard = hCard;
scTransmitStruct.cbSendLength = cbSendLength;
scTransmitStruct.pcbRecvLength = *pcbRecvLength;
Expand Down
2 changes: 1 addition & 1 deletion src/winscard_msg.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ INTERNAL int32_t MessageSend(void *buffer_void, uint64_t buffer_size,
} else
{
/* we ignore the signals and socket full situations, all
* other errors are fatal */
* other errors are fatal */
if (errno != EINTR && errno != EAGAIN)
{
retval = -1;
Expand Down

0 comments on commit bb21e05

Please sign in to comment.