diff options
| author | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2009-10-31 00:48:38 +0000 |
| commit | 02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b (patch) | |
| tree | 61b9147863cd8be3eff63903dc36cae168254bd5 /src/ccapi/common/win | |
| parent | 162ab371748cba0cc6f172419bd6e71fa04bb878 (diff) | |
| download | krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.gz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.tar.xz krb5-02d6bcbc98a214e7aeaaa9f45f0db8784a7b743b.zip | |
make mark-cstyle
make reindent
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23100 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/ccapi/common/win')
| -rw-r--r-- | src/ccapi/common/win/OldCC/ccutils.c | 8 | ||||
| -rw-r--r-- | src/ccapi/common/win/cci_os_debugging.c | 2 | ||||
| -rw-r--r-- | src/ccapi/common/win/tls.c | 14 | ||||
| -rw-r--r-- | src/ccapi/common/win/tls.h | 2 | ||||
| -rw-r--r-- | src/ccapi/common/win/win-utils.c | 6 |
5 files changed, 15 insertions, 17 deletions
diff --git a/src/ccapi/common/win/OldCC/ccutils.c b/src/ccapi/common/win/OldCC/ccutils.c index cf881cda1..220b1d1d2 100644 --- a/src/ccapi/common/win/OldCC/ccutils.c +++ b/src/ccapi/common/win/OldCC/ccutils.c @@ -57,7 +57,7 @@ BOOL isNT() { bIsNT = FALSE; break; } - + if (!bSupportedVersion) { cci_debug_printf("%s Running on an unsupported version of Windows", __FUNCTION__); status = 1; @@ -104,7 +104,7 @@ HANDLE createThreadEvent(char* uuid, char* suffix) { } #if 0 cci_debug_printf("%s event_name:%s", __FUNCTION__, event_name); -#endif +#endif if (!status) { hEvent = CreateEvent(psa, FALSE, FALSE, event_name); if (!hEvent) status = cci_check_error(GetLastError()); @@ -112,7 +112,7 @@ HANDLE createThreadEvent(char* uuid, char* suffix) { if (!status) ResetEvent(hEvent); - + if (event_name) free(event_name); if (isNT()) free(sa.lpSecurityDescriptor); @@ -137,4 +137,4 @@ HANDLE openThreadEvent(char* uuid, char* suffix) { if (event_name) free(event_name); return hEvent; - }
\ No newline at end of file + } diff --git a/src/ccapi/common/win/cci_os_debugging.c b/src/ccapi/common/win/cci_os_debugging.c index 6e6a7158d..5a8c9e723 100644 --- a/src/ccapi/common/win/cci_os_debugging.c +++ b/src/ccapi/common/win/cci_os_debugging.c @@ -24,7 +24,7 @@ * or implied warranty. */ -#include <stdio.h> +#include <stdio.h> #include <stdarg.h> #include "cci_os_debugging.h" diff --git a/src/ccapi/common/win/tls.c b/src/ccapi/common/win/tls.c index 5e0e11d7a..60c8ea160 100644 --- a/src/ccapi/common/win/tls.c +++ b/src/ccapi/common/win/tls.c @@ -73,15 +73,15 @@ char* tspdata_getUUID (const struct tspdata* p) {return p->_ RPC_ASYNC_STATE* tspdata_getRpcAState (const struct tspdata* p) {return p->_rpcState;} BOOL WINAPI PutTspData(DWORD dwTlsIndex, struct tspdata* dw) { - LPVOID lpvData; - struct tspdata** pData; // The stored memory pointer + LPVOID lpvData; + struct tspdata** pData; // The stored memory pointer // Retrieve a data pointer for the current thread: - lpvData = TlsGetValue(dwTlsIndex); + lpvData = TlsGetValue(dwTlsIndex); // If NULL, allocate memory for the TLS slot for this thread: if (lpvData == NULL) { - lpvData = (LPVOID) LocalAlloc(LPTR, sizeof(struct tspdata)); + lpvData = (LPVOID) LocalAlloc(LPTR, sizeof(struct tspdata)); if (lpvData == NULL) return FALSE; if (!TlsSetValue(dwTlsIndex, lpvData)) return FALSE; } @@ -95,12 +95,10 @@ BOOL WINAPI PutTspData(DWORD dwTlsIndex, struct tspdata* dw) { } BOOL WINAPI GetTspData(DWORD dwTlsIndex, struct tspdata** pdw) { - struct tspdata* pData; // The stored memory pointer + struct tspdata* pData; // The stored memory pointer - pData = (struct tspdata*)TlsGetValue(dwTlsIndex); + pData = (struct tspdata*)TlsGetValue(dwTlsIndex); if (pData == NULL) return FALSE; (*pdw) = pData; return TRUE; } - - diff --git a/src/ccapi/common/win/tls.h b/src/ccapi/common/win/tls.h index 32854f076..d688ed230 100644 --- a/src/ccapi/common/win/tls.h +++ b/src/ccapi/common/win/tls.h @@ -37,7 +37,7 @@ #define UUID_SIZE 128 -/* The client code can be run in any client thread. +/* The client code can be run in any client thread. The thread-specific data is defined here. */ diff --git a/src/ccapi/common/win/win-utils.c b/src/ccapi/common/win/win-utils.c index f60ee3b8f..3795ca544 100644 --- a/src/ccapi/common/win/win-utils.c +++ b/src/ccapi/common/win/win-utils.c @@ -52,18 +52,18 @@ char* clientEndpoint(const char* UUID) { strncat(_clientEndpoint, UUID, UUID_SIZE); // cci_debug_printf("%s returning %s", __FUNCTION__, _clientEndpoint); return _clientEndpoint; - } + } char* serverEndpoint(const char* user) { char* _serverEndpoint = (char*)malloc(strlen(user) + strlen(serverPrefix) + 2); strcpy(_serverEndpoint, serverPrefix); strncat(_serverEndpoint, user, UUID_SIZE); return _serverEndpoint; - } + } char* timestamp() { SYSTEMTIME _stime; GetSystemTime(&_stime); GetTimeFormat(LOCALE_SYSTEM_DEFAULT, 0, &_stime, "HH:mm:ss", _ts, sizeof(_ts)-1); return _ts; - }
\ No newline at end of file + } |
