From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 6 Nov 2009 23:47:19 +0000 (+1300)
Subject: Fix several casting issues detected by FreeBSD.
X-Git-Tag: SQUID_3_2_0_1~599
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bebe737a9b87aef23a50a6750a5f043d2ae13bab;p=thirdparty%2Fsquid.git

Fix several casting issues detected by FreeBSD.
---

diff --git a/helpers/negotiate_auth/kerberos/spnegohelp/spnego.cc b/helpers/negotiate_auth/kerberos/spnegohelp/spnego.cc
index 70f2837f94..1bec85db5d 100644
--- a/helpers/negotiate_auth/kerberos/spnegohelp/spnego.cc
+++ b/helpers/negotiate_auth/kerberos/spnegohelp/spnego.cc
@@ -136,7 +136,7 @@ spnegoCreateNegTokenInit(SPNEGO_MECH_OID MechType,
                                                     &nTokenLength, &nInternalTokenLength))
                 == SPNEGO_E_SUCCESS) {
             // Allocate a buffer to hold the data.
-            pbTokenData = calloc(1, nTokenLength);
+            pbTokenData = static_cast<unsigned char*>(calloc(1, nTokenLength));
 
             if (NULL != pbTokenData) {
 
@@ -235,7 +235,7 @@ spnegoCreateNegTokenTarg(SPNEGO_MECH_OID MechType,
                                                     &nInternalTokenLength))
                 == SPNEGO_E_SUCCESS) {
             // Allocate a buffer to hold the data.
-            pbTokenData = calloc(1, nTokenLength);
+            pbTokenData = static_cast<unsigned char*>(calloc(1, nTokenLength));
 
             if (NULL != pbTokenData) {
 
@@ -537,16 +537,11 @@ spnegoGetNegotiationResult(SPNEGO_TOKEN_HANDLE hSpnegoToken,
             NULL != pnegResult && SPNEGO_TOKEN_TARG == pSpnegoToken->ucTokenType) {
 
         // Check if NegResult is available
-        if (pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].
-                iElementPresent == SPNEGO_TOKEN_ELEMENT_AVAILABLE) {
+        if (pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].iElementPresent == SPNEGO_TOKEN_ELEMENT_AVAILABLE) {
             // Must be 1 byte long and a valid value
-            if (pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].
-                    nDatalength == SPNEGO_NEGTARG_MAXLEN_NEGRESULT
-                    && IsValidNegResult(*pSpnegoToken->
-                                        aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].pbData)) {
-                *pnegResult =
-                    *pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].
-                    pbData;
+            if (pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].nDatalength == SPNEGO_NEGTARG_MAXLEN_NEGRESULT
+                    && IsValidNegResult(*pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].pbData)) {
+                *pnegResult = static_cast<SPNGEO_RESULT>(*pSpnegoToken->aElementArray[SPNEGO_TARG_NEGRESULT_ELEMENT].pbData);
                 nReturn = SPNEGO_E_SUCCESS;
             } else {
                 nReturn = SPNEGO_E_INVALID_ELEMENT;
@@ -555,7 +550,7 @@ spnegoGetNegotiationResult(SPNEGO_TOKEN_HANDLE hSpnegoToken,
             nReturn = SPNEGO_E_ELEMENT_UNAVAILABLE;
         }
 
-    }				// IF parameters OK
+    } // IF parameters OK
 
     LOG(("spnegoGetNegotiationResult returned %d\n", nReturn));
     return nReturn;;
@@ -615,14 +610,13 @@ spnegoGetSupportedMechType(SPNEGO_TOKEN_HANDLE hSpnegoToken,
                     *pMechOID = nCtr;
                 }
 
-            }			// For enum MechOIDs
-
+            } // For enum MechOIDs
 
         } else {
             nReturn = SPNEGO_E_ELEMENT_UNAVAILABLE;
         }
 
-    }				// IF parameters OK
+    } // IF parameters OK
 
     LOG(("spnegoGetSupportedMechType returned %d\n", nReturn));
     return nReturn;;