From 4b3d3cd69e4fb55c045ad3aa101780559a22ec15 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 10 Aug 2016 12:49:36 +0200 Subject: [PATCH] Warning fixes. --- winpr/include/winpr/interlocked.h | 18 ++++---- winpr/libwinpr/interlocked/interlocked.c | 70 ++++++++++++++++---------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/winpr/include/winpr/interlocked.h b/winpr/include/winpr/interlocked.h index 96a83e2..660f8f3 100644 --- a/winpr/include/winpr/interlocked.h +++ b/winpr/include/winpr/interlocked.h @@ -33,7 +33,7 @@ extern "C" { #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ - ((type *)(((ULONG_PTR) address) - (ULONG_PTR)(&(((type *) 0)->field)))) + ((type *)(((ULONG_PTR) address) - (ULONG_PTR)(&(((type *) 0)->field)))) #endif typedef struct _WINPR_LIST_ENTRY WINPR_LIST_ENTRY; @@ -41,8 +41,8 @@ typedef struct _WINPR_LIST_ENTRY* WINPR_PLIST_ENTRY; struct _WINPR_LIST_ENTRY { - WINPR_PLIST_ENTRY Flink; - WINPR_PLIST_ENTRY Blink; + WINPR_PLIST_ENTRY Flink; + WINPR_PLIST_ENTRY Blink; }; typedef struct _WINPR_SINGLE_LIST_ENTRY WINPR_SINGLE_LIST_ENTRY; @@ -50,7 +50,7 @@ typedef struct _WINPR_SINGLE_LIST_ENTRY* WINPR_PSINGLE_LIST_ENTRY; struct _WINPR_SINGLE_LIST_ENTRY { - WINPR_PSINGLE_LIST_ENTRY Next; + WINPR_PSINGLE_LIST_ENTRY Next; }; typedef struct WINPR_LIST_ENTRY32 @@ -72,14 +72,14 @@ typedef WINPR_LIST_ENTRY64 *WINPR_PLIST_ENTRY64; typedef struct _WINPR_SLIST_ENTRY *WINPR_PSLIST_ENTRY; typedef struct DECLSPEC_ALIGN(16) _WINPR_SLIST_ENTRY { - WINPR_PSLIST_ENTRY Next; + WINPR_PSLIST_ENTRY Next; } WINPR_SLIST_ENTRY; #else /* _WIN64 */ -#define WINPR_SLIST_ENTRY SINGLE_LIST_ENTRY -#define _WINPR_SLIST_ENTRY _SINGLE_LIST_ENTRY -#define WINPR_PSLIST_ENTRY PSINGLE_LIST_ENTRY +#define WINPR_SLIST_ENTRY WINPR_SINGLE_LIST_ENTRY +#define _WINPR_SLIST_ENTRY _WINPR_SINGLE_LIST_ENTRY +#define WINPR_PSLIST_ENTRY WINPR_PSINGLE_LIST_ENTRY #endif /* _WIN64 */ @@ -122,7 +122,7 @@ typedef union _WINPR_SLIST_HEADER struct { - WINPR_SLIST_ENTRY Next; + WINPR_SLIST_ENTRY Next; WORD Depth; WORD Sequence; } DUMMYSTRUCTNAME; diff --git a/winpr/libwinpr/interlocked/interlocked.c b/winpr/libwinpr/interlocked/interlocked.c index 9a84c72..998bb78 100644 --- a/winpr/libwinpr/interlocked/interlocked.c +++ b/winpr/libwinpr/interlocked/interlocked.c @@ -44,13 +44,13 @@ VOID InitializeSListHead(WINPR_PSLIST_HEADER ListHead) #endif } -PWINPR_SLIST_ENTRY InterlockedPushEntrySList(WINPR_PSLIST_HEADER ListHead, PWINPR_SLIST_ENTRY ListEntry) +WINPR_PSLIST_ENTRY InterlockedPushEntrySList(WINPR_PSLIST_HEADER ListHead, WINPR_PSLIST_ENTRY ListEntry) { WINPR_SLIST_HEADER old; - WINPR_SLIST_HEADER new; + WINPR_SLIST_HEADER newHeader; #ifdef _WIN64 - new.HeaderX64.NextEntry = (((ULONG_PTR) ListEntry) >> 4); + newHeader.HeaderX64.NextEntry = (((ULONG_PTR) ListEntry) >> 4); while (1) { @@ -58,34 +58,34 @@ PWINPR_SLIST_ENTRY InterlockedPushEntrySList(WINPR_PSLIST_HEADER ListHead, PWINP ListEntry->Next = (PSLIST_ENTRY) (((ULONG_PTR) old.HeaderX64.NextEntry) << 4); - new.HeaderX64.Depth = old.HeaderX64.Depth + 1; - new.HeaderX64.Sequence = old.HeaderX64.Sequence + 1; + newHeader.HeaderX64.Depth = old.HeaderX64.Depth + 1; + newHeader.HeaderX64.Sequence = old.HeaderX64.Sequence + 1; - if (InterlockedCompareExchange64((LONGLONG*) ListHead, new.s.Alignment, old.s.Alignment)) + if (InterlockedCompareExchange64((LONGLONG*) ListHead, newHeader.s.Alignment, old.s.Alignment)) { - InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], new.s.Region, old.s.Region); + InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], newHeader.s.Region, old.s.Region); break; } } return (PSLIST_ENTRY) ((ULONG_PTR) old.HeaderX64.NextEntry << 4); #else - new.s.Next.Next = ListEntry; + newHeader.s.Next.Next = ListEntry; do { old = *ListHead; ListEntry->Next = old.s.Next.Next; - new.s.Depth = old.s.Depth + 1; - new.s.Sequence = old.s.Sequence + 1; + newHeader.s.Depth = old.s.Depth + 1; + newHeader.s.Sequence = old.s.Sequence + 1; } - while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, new.Alignment, old.Alignment) != old.Alignment); + while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, newHeader.Alignment, old.Alignment) != old.Alignment); return old.s.Next.Next; #endif } -PWINPR_SLIST_ENTRY InterlockedPushListSListEx(WINPR_PSLIST_HEADER ListHead, PWINPR_SLIST_ENTRY List, PWINPR_SLIST_ENTRY ListEnd, ULONG Count) +WINPR_PSLIST_ENTRY InterlockedPushListSListEx(WINPR_PSLIST_HEADER ListHead, WINPR_PSLIST_ENTRY List, WINPR_PSLIST_ENTRY ListEnd, ULONG Count) { #ifdef _WIN64 @@ -95,11 +95,11 @@ PWINPR_SLIST_ENTRY InterlockedPushListSListEx(WINPR_PSLIST_HEADER ListHead, PWIN return NULL; } -PWINPR_SLIST_ENTRY InterlockedPopEntrySList(WINPR_PSLIST_HEADER ListHead) +WINPR_PSLIST_ENTRY InterlockedPopEntrySList(WINPR_PSLIST_HEADER ListHead) { WINPR_SLIST_HEADER old; - WINPR_SLIST_HEADER new; - PWINPR_SLIST_ENTRY entry; + WINPR_SLIST_HEADER newHeader; + WINPR_PSLIST_ENTRY entry; #ifdef _WIN64 while (1) @@ -111,13 +111,13 @@ PWINPR_SLIST_ENTRY InterlockedPopEntrySList(WINPR_PSLIST_HEADER ListHead) if (!entry) return NULL; - new.HeaderX64.NextEntry = ((ULONG_PTR) entry->Next) >> 4; - new.HeaderX64.Depth = old.HeaderX64.Depth - 1; - new.HeaderX64.Sequence = old.HeaderX64.Sequence - 1; + newHeader.HeaderX64.NextEntry = ((ULONG_PTR) entry->Next) >> 4; + newHeader.HeaderX64.Depth = old.HeaderX64.Depth - 1; + newHeader.HeaderX64.Sequence = old.HeaderX64.Sequence - 1; - if (InterlockedCompareExchange64((LONGLONG*) ListHead, new.s.Alignment, old.s.Alignment)) + if (InterlockedCompareExchange64((LONGLONG*) ListHead, newHeader.s.Alignment, old.s.Alignment)) { - InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], new.s.Region, old.s.Region); + InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], newHeader.s.Region, old.s.Region); break; } } @@ -131,50 +131,50 @@ PWINPR_SLIST_ENTRY InterlockedPopEntrySList(WINPR_PSLIST_HEADER ListHead) if (!entry) return NULL; - new.s.Next.Next = entry->Next; - new.s.Depth = old.s.Depth - 1; - new.s.Sequence = old.s.Sequence + 1; + newHeader.s.Next.Next = entry->Next; + newHeader.s.Depth = old.s.Depth - 1; + newHeader.s.Sequence = old.s.Sequence + 1; } - while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, new.Alignment, old.Alignment) != old.Alignment); + while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, newHeader.Alignment, old.Alignment) != old.Alignment); #endif return entry; } -PWINPR_SLIST_ENTRY InterlockedFlushSList(WINPR_PSLIST_HEADER ListHead) +WINPR_PSLIST_ENTRY InterlockedFlushSList(WINPR_PSLIST_HEADER ListHead) { WINPR_SLIST_HEADER old; - WINPR_SLIST_HEADER new; + WINPR_SLIST_HEADER newHeader; if (!QueryDepthSList(ListHead)) return NULL; #ifdef _WIN64 - new.s.Alignment = 0; - new.s.Region = 0; - new.HeaderX64.HeaderType = 1; + newHeader.s.Alignment = 0; + newHeader.s.Region = 0; + newHeader.HeaderX64.HeaderType = 1; while (1) { old = *ListHead; - new.HeaderX64.Sequence = old.HeaderX64.Sequence + 1; + newHeader.HeaderX64.Sequence = old.HeaderX64.Sequence + 1; - if (InterlockedCompareExchange64((LONGLONG*) ListHead, new.s.Alignment, old.s.Alignment)) + if (InterlockedCompareExchange64((LONGLONG*) ListHead, newHeader.s.Alignment, old.s.Alignment)) { - InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], new.s.Region, old.s.Region); + InterlockedCompareExchange64(&((LONGLONG*) ListHead)[1], newHeader.s.Region, old.s.Region); break; } } return (PSLIST_ENTRY) (((ULONG_PTR) old.HeaderX64.NextEntry) << 4); #else - new.Alignment = 0; + newHeader.Alignment = 0; do { old = *ListHead; - new.s.Sequence = old.s.Sequence + 1; + newHeader.s.Sequence = old.s.Sequence + 1; } - while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, new.Alignment, old.Alignment) != old.Alignment); + while(InterlockedCompareExchange64((LONGLONG*) &ListHead->Alignment, newHeader.Alignment, old.Alignment) != old.Alignment); return old.s.Next.Next; #endif -- 2.7.4