oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use min/max instead of MIN/MAX

Browse Source
This commit is contained in:
Asanka C. Herath
2010-11-24 13:00:12 -05:00
parent 0a123a5945
commit 827058a8ff
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ntlm/ntlm.c
View File

@@ -855,23 +855,23 @@ heim_ntlm_decode_type3(const struct ntlm_buf *buf,
CHECK(type, 3); CHECK(type, 3);
CHECK(ret_sec_buffer(in, &lm), 0); CHECK(ret_sec_buffer(in, &lm), 0);
if (lm.allocated) if (lm.allocated)
min_offset = MIN(min_offset, lm.offset); min_offset = min(min_offset, lm.offset);
CHECK(ret_sec_buffer(in, &ntlm), 0); CHECK(ret_sec_buffer(in, &ntlm), 0);
if (ntlm.allocated) if (ntlm.allocated)
min_offset = MIN(min_offset, ntlm.offset); min_offset = min(min_offset, ntlm.offset);
CHECK(ret_sec_buffer(in, &target), 0); CHECK(ret_sec_buffer(in, &target), 0);
if (target.allocated) if (target.allocated)
min_offset = MIN(min_offset, target.offset); min_offset = min(min_offset, target.offset);
CHECK(ret_sec_buffer(in, &username), 0); CHECK(ret_sec_buffer(in, &username), 0);
if (username.allocated) if (username.allocated)
min_offset = MIN(min_offset, username.offset); min_offset = min(min_offset, username.offset);
CHECK(ret_sec_buffer(in, &ws), 0); CHECK(ret_sec_buffer(in, &ws), 0);
if (ws.allocated) if (ws.allocated)
min_offset = MIN(min_offset, ws.offset); min_offset = min(min_offset, ws.offset);
if (min_offset > 52) { if (min_offset > 52) {
CHECK(ret_sec_buffer(in, &sessionkey), 0); CHECK(ret_sec_buffer(in, &sessionkey), 0);
min_offset = MAX(min_offset, sessionkey.offset); min_offset = max(min_offset, sessionkey.offset);
CHECK(krb5_ret_uint32(in, &type3->flags), 0); CHECK(krb5_ret_uint32(in, &type3->flags), 0);
} }
if (min_offset > 52 + 8 + 4 + 8) { if (min_offset > 52 + 8 + 4 + 8) {