Changeset 63447 in vbox for trunk

Timestamp:

Aug 14, 2016 11:54:12 PM (8 years ago)

Author:

vboxsync

Message:

warnings

Location:

trunk/src/VBox

Files:

• HostServices/auth/directoryservice/directoryservice.cpp (modified) (14 diffs)
• Main/cbinding/VBoxCAPI.cpp (modified) (1 diff)

trunk/src/VBox/HostServices/auth/directoryservice/directoryservice.cpp

@@ -38 +38 @@
         /* Try to find the default search node for local names */
         UInt32 cNodes;
-        tContextData pCtx = NULL;
-        dsErr = dsFindDirNodes(pDirRef, pTmpBuf, NULL, eDSLocalNodeNames, &cNodes, &pCtx);
+        tContextData hCtx = 0;
+        dsErr = dsFindDirNodes(pDirRef, pTmpBuf, NULL, eDSLocalNodeNames, &cNodes, &hCtx);
         /* Any nodes found? */
         if (   dsErr == eDSNoErr
@@ -48 +48 @@
             dsErr = eDSNodeNotFound;
 
-        if (pCtx)
-            dsReleaseContinueData(pDirRef, pCtx);
+        if (hCtx) /* (DSoNodeConfig.m from DSTools-162 does exactly the same free if not-zero-regardless-of-return-code.) */
+            dsReleaseContinueData(pDirRef, hCtx);
         dsDataBufferDeAllocate(pDirRef, pTmpBuf);
     }
@@ -76 +76 @@
             /* Now search for the first matching record */
             UInt32 cRecords = 1;
-            tContextData pCtx = NULL;
+            tContextData hCtx = 0;
             dsErr = dsGetRecordList(pNodeRef,
                                     pTmpBuf,
@@ -85 +85 @@
                                     false,
                                     &cRecords,
-                                    &pCtx);
+                                    &hCtx);
             if (   dsErr == eDSNoErr
                 && cRecords >= 1)
             {
                 /* Process the first found record. Look at any attribute one by one. */
-                tAttributeListRef pRecAttrListRef = NULL;
+                tAttributeListRef hRecAttrListRef = 0;
                 tRecordEntryPtr pRecEntry = NULL;
                 tDataListPtr pAuthNodeList = NULL;
-                dsErr = dsGetRecordEntry(pNodeRef, pTmpBuf, 1, &pRecAttrListRef, &pRecEntry);
+                dsErr = dsGetRecordEntry(pNodeRef, pTmpBuf, 1, &hRecAttrListRef, &pRecEntry);
                 if (dsErr == eDSNoErr)
                 {
                     for (size_t i = 1; i <= pRecEntry->fRecordAttributeCount; ++i)
                     {
-                        tAttributeValueListRef pAttrValueListRef = NULL;
+                        tAttributeValueListRef hAttrValueListRef = 0;
                         tAttributeEntryPtr pAttrEntry = NULL;
                         /* Get the information for this attribute. */
-                        dsErr = dsGetAttributeEntry(pNodeRef, pTmpBuf, pRecAttrListRef, i,
-                                                    &pAttrValueListRef, &pAttrEntry);
+                        dsErr = dsGetAttributeEntry(pNodeRef, pTmpBuf, hRecAttrListRef, i,
+                                                    &hAttrValueListRef, &pAttrEntry);
                         if (dsErr == eDSNoErr)
                         {
@@ -109 +109 @@
                             if (pAttrEntry->fAttributeValueCount > 0)
                             {
-                                dsErr = dsGetAttributeValue(pNodeRef, pTmpBuf, 1, pAttrValueListRef, &pValueEntry);
+                                dsErr = dsGetAttributeValue(pNodeRef, pTmpBuf, 1, hAttrValueListRef, &pValueEntry);
                                 if (dsErr == eDSNoErr)
                                 {
@@ -127 +127 @@
                             if (pValueEntry != NULL)
                                 dsDeallocAttributeValueEntry(pDirRef, pValueEntry);
-                            if (pAttrValueListRef)
-                                dsCloseAttributeValueList(pAttrValueListRef);
+                            if (hAttrValueListRef)
+                                dsCloseAttributeValueList(hAttrValueListRef);
                             if (pAttrEntry != NULL)
                                 dsDeallocAttributeEntry(pDirRef, pAttrEntry);
@@ -156 +156 @@
                         free(pAuthNodeList);
                 }
-                if (pRecAttrListRef)
-                    dsCloseAttributeList(pRecAttrListRef);
+                if (hRecAttrListRef)
+                    dsCloseAttributeList(hRecAttrListRef);
                 if (pRecEntry != NULL)
                     dsDeallocRecordEntry(pDirRef, pRecEntry);
@@ -163 +163 @@
             else
                 dsErr = eDSRecordNotFound;
-            if (pCtx)
-                dsReleaseContinueData(pDirRef, pCtx);
+            if (hCtx)
+                dsReleaseContinueData(pDirRef, hCtx);
         }
         else
@@ -198 +198 @@
     tDirStatus dsErr = eDSNoErr;
     /* Open the authentication node. */
-    tDirNodeReference pAuthNodeRef = NULL;
-    dsErr = dsOpenDirNode(pDirRef, pAuthNodeList, &pAuthNodeRef);
+    tDirNodeReference hAuthNodeRef = 0;
+    dsErr = dsOpenDirNode(pDirRef, pAuthNodeList, &hAuthNodeRef);
     if (dsErr == eDSNoErr)
     {
@@ -236 +236 @@
                     pAuthInBuf->fBufferLength += cPassword;
                     /* Now authenticate */
-                    dsErr = dsDoDirNodeAuth(pAuthNodeRef, pAuthMethod, true, pAuthInBuf, pAuthOutBuf, NULL);
+                    dsErr = dsDoDirNodeAuth(hAuthNodeRef, pAuthMethod, true, pAuthInBuf, pAuthOutBuf, NULL);
                     /* Clean up. */
                     dsDataBufferDeAllocate(pDirRef, pAuthInBuf);
@@ -250 +250 @@
         else
             dsErr = eDSAllocationFailed;
-        dsCloseDirNode(pAuthNodeRef);
+        dsCloseDirNode(hAuthNodeRef);
     }
 
@@ -257 +257 @@
 
 RT_C_DECLS_BEGIN
-DECLEXPORT(AuthResult) AUTHCALL AuthEntry(const char *szCaller,
+DECLEXPORT(FNAUTHENTRY3) AuthEntry;
+RT_C_DECLS_END
+
+DECLEXPORT(AuthResult) AUTHCALL AuthEntry(const char *pszCaller,
                                           PAUTHUUID pUuid,
                                           AuthGuestJudgement guestJudgement,
-                                          const char *szUser,
-                                          const char *szPassword,
-                                          const char *szDomain,
+                                          const char *pszUser,
+                                          const char *pszPassword,
+                                          const char *pszDomain,
                                           int fLogon,
                                           unsigned clientId)
 {
+    RT_NOREF(pszCaller, pUuid, guestJudgement, pszDomain, clientId);
+
     /* Validate input */
-    AssertPtrReturn(szUser, AuthResultAccessDenied);
-    AssertPtrReturn(szPassword, AuthResultAccessDenied);
+    AssertPtrReturn(pszUser, AuthResultAccessDenied);
+    AssertPtrReturn(pszPassword, AuthResultAccessDenied);
 
     /* Result to a default value */
@@ -279 +284 @@
     tDirStatus dsErr = eDSNoErr;
     tDirStatus dsCleanErr = eDSNoErr;
-    tDirReference pDirRef = NULL;
+    tDirReference hDirRef = 0;
     /* Connect to the Directory Service. */
-    dsErr = dsOpenDirService(&pDirRef);
+    dsErr = dsOpenDirService(&hDirRef);
     if (dsErr == eDSNoErr)
     {
         /* Fetch the default search node */
         tDataListPtr pSearchNodeList = NULL;
-        dsErr = defaultSearchNodePath(pDirRef, &pSearchNodeList);
+        dsErr = defaultSearchNodePath(hDirRef, &pSearchNodeList);
         if (dsErr == eDSNoErr)
         {
             /* Open the default search node */
-            tDirNodeReference pSearchNodeRef = NULL;
-            dsErr = dsOpenDirNode(pDirRef, pSearchNodeList, &pSearchNodeRef);
+            tDirNodeReference hSearchNodeRef = 0;
+            dsErr = dsOpenDirNode(hDirRef, pSearchNodeList, &hSearchNodeRef);
             if (dsErr == eDSNoErr)
             {
@@ -299 +304 @@
                  * authenticate has the short form. */
                 tDataListPtr pAuthNodeList = NULL;
-                dsErr = userAuthInfo(pDirRef, pSearchNodeRef, szUser, &pAuthNodeList);
+                dsErr = userAuthInfo(hDirRef, hSearchNodeRef, pszUser, &pAuthNodeList);
                 if (dsErr == eDSNoErr)
                 {
                     /* Open the authentication node and do the authentication. */
-                    dsErr = authWithNode(pDirRef, pAuthNodeList, szUser, szPassword);
+                    dsErr = authWithNode(hDirRef, pAuthNodeList, pszUser, pszPassword);
                     if (dsErr == eDSNoErr)
                         result = AuthResultAccessGranted;
-                    dsCleanErr = dsDataListDeallocate(pDirRef, pAuthNodeList);
+                    dsCleanErr = dsDataListDeallocate(hDirRef, pAuthNodeList);
                     if (dsCleanErr == eDSNoErr)
                         free(pAuthNodeList);
                 }
-                dsCloseDirNode(pSearchNodeRef);
+                dsCloseDirNode(hSearchNodeRef);
             }
-            dsCleanErr = dsDataListDeallocate(pDirRef, pSearchNodeList);
+            dsCleanErr = dsDataListDeallocate(hDirRef, pSearchNodeList);
             if (dsCleanErr == eDSNoErr)
                 free(pSearchNodeList);
         }
-        dsCloseDirService(pDirRef);
+        dsCloseDirService(hDirRef);
     }
 
     return result;
 }
-RT_C_DECLS_END
-
-static PAUTHENTRY3 gpfnAuthEntry = AuthEntry;
-
+

trunk/src/VBox/Main/cbinding/VBoxCAPI.cpp

@@ -39 +39 @@
 #include "VBox/com/NativeEventQueue.h"
 
+
+#ifndef RT_OS_DARWIN /* Probably not used for xpcom, so clang gets upset: error: using directive refers to implicitly-defined namespace 'std' [-Werror]*/
 using namespace std;
+#endif
 
 /* The following 2 object references should be eliminated once the legacy