Skip to content

Commit 64b305b

Browse files
committed
5-14 C1
1 parent bf41884 commit 64b305b

File tree

3 files changed

+703
-705
lines changed

3 files changed

+703
-705
lines changed

contrib/win32/win32compat/lsa/LsaString.cpp

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -54,36 +54,36 @@ extern "C" {
5454

5555
NTSTATUS LsaAllocUnicodeString(PUNICODE_STRING *lsaStr, DWORD maxLen)
5656
{
57-
NTSTATUS ntStat = STATUS_NO_MEMORY;
58-
59-
FAIL(lsaStr == NULL);
60-
61-
*lsaStr = (PUNICODE_STRING) LsaApi.AllocateLsaHeap(sizeof(UNICODE_STRING));
62-
63-
FAIL((*lsaStr) == NULL);
64-
65-
(*lsaStr) -> Buffer = (WCHAR *) LsaApi.AllocateLsaHeap(sizeof(maxLen));
66-
(*lsaStr) -> Length = 0;
67-
(*lsaStr) -> MaximumLength = maxLen;
68-
69-
FAIL((*lsaStr) -> Buffer == NULL);
70-
71-
ntStat = 0;
72-
57+
NTSTATUS ntStat = STATUS_NO_MEMORY;
58+
59+
FAIL(lsaStr == NULL);
60+
61+
*lsaStr = (PUNICODE_STRING)LsaApi.AllocateLsaHeap(sizeof(UNICODE_STRING));
62+
63+
FAIL((*lsaStr) == NULL);
64+
65+
(*lsaStr)->Buffer = (WCHAR *)LsaApi.AllocateLsaHeap(sizeof(maxLen));
66+
(*lsaStr)->Length = 0;
67+
(*lsaStr)->MaximumLength = maxLen;
68+
69+
FAIL((*lsaStr)->Buffer == NULL);
70+
71+
ntStat = 0;
72+
7373
fail:
7474

75-
if (ntStat)
76-
{
77-
if (lsaStr && (*lsaStr))
78-
{
79-
LsaApi.FreeLsaHeap((*lsaStr) -> Buffer);
80-
81-
LsaApi.FreeLsaHeap((*lsaStr));
82-
}
83-
84-
}
85-
86-
return ntStat;
75+
if (ntStat)
76+
{
77+
if (lsaStr && (*lsaStr))
78+
{
79+
LsaApi.FreeLsaHeap((*lsaStr)->Buffer);
80+
81+
LsaApi.FreeLsaHeap((*lsaStr));
82+
}
83+
84+
}
85+
86+
return ntStat;
8787
}
8888

8989
//
@@ -94,15 +94,15 @@ NTSTATUS LsaAllocUnicodeString(PUNICODE_STRING *lsaStr, DWORD maxLen)
9494

9595
void LsaFreeUnicodeString(PUNICODE_STRING lsaStr)
9696
{
97-
if (lsaStr)
98-
{
99-
if (lsaStr -> Buffer)
100-
{
101-
LsaApi.FreeLsaHeap(lsaStr -> Buffer);
102-
}
103-
104-
LsaApi.FreeLsaHeap(lsaStr);
105-
}
97+
if (lsaStr)
98+
{
99+
if (lsaStr->Buffer)
100+
{
101+
LsaApi.FreeLsaHeap(lsaStr->Buffer);
102+
}
103+
104+
LsaApi.FreeLsaHeap(lsaStr);
105+
}
106106
}
107107

108108
//
@@ -116,46 +116,46 @@ void LsaFreeUnicodeString(PUNICODE_STRING lsaStr)
116116

117117
NTSTATUS FillUnicodeString(UNICODE_STRING *lsaStr, const Char *str)
118118
{
119-
NTSTATUS ntStat = STATUS_NO_MEMORY;
120-
121-
DWORD cbSize = 0;
122-
123-
//
124-
// Is arguments ok?
125-
//
126-
127-
FAIL(lsaStr == NULL);
128-
129-
FAIL(lsaStr -> Buffer == NULL);
130-
131-
FAIL(str == NULL);
132-
133-
//
134-
// Is string buffer too small?
135-
//
136-
137-
cbSize = strlen(str);
138-
139-
FAIL(cbSize >= lsaStr -> MaximumLength);
140-
141-
//
142-
// Fill string buffer.
143-
//
144-
119+
NTSTATUS ntStat = STATUS_NO_MEMORY;
120+
121+
DWORD cbSize = 0;
122+
123+
//
124+
// Is arguments ok?
125+
//
126+
127+
FAIL(lsaStr == NULL);
128+
129+
FAIL(lsaStr->Buffer == NULL);
130+
131+
FAIL(str == NULL);
132+
133+
//
134+
// Is string buffer too small?
135+
//
136+
137+
cbSize = strlen(str);
138+
139+
FAIL(cbSize >= lsaStr->MaximumLength);
140+
141+
//
142+
// Fill string buffer.
143+
//
144+
145145
#ifdef __VS_BUILD__
146-
_swprintf(lsaStr -> Buffer, L"%hs", str);
146+
_swprintf(lsaStr->Buffer, L"%hs", str);
147147
#else
148-
swprintf(lsaStr->Buffer, L"%hs", str);
148+
swprintf(lsaStr->Buffer, L"%hs", str);
149149
#endif
150-
151-
lsaStr -> Length = cbSize * 2;
152-
153-
lsaStr -> Buffer[cbSize * 2] = 0x0000;
154-
155-
ntStat = STATUS_SUCCESS;
156-
150+
151+
lsaStr->Length = cbSize * 2;
152+
153+
lsaStr->Buffer[cbSize * 2] = 0x0000;
154+
155+
ntStat = STATUS_SUCCESS;
156+
157157
fail:
158158

159-
160-
return ntStat;
159+
160+
return ntStat;
161161
}

0 commit comments

Comments
 (0)