Changeset 90867 in vbox for trunk

Timestamp:

Aug 25, 2021 9:16:25 AM (3 years ago)

Author:

vboxsync

Message:

Audio/VKAT: Fixed naming (PATSSERVERINST -> PATSCLIENTINST). ​bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTestService.cpp (modified) (29 diffs)

trunk/src/VBox/Devices/Audio/AudioTestService.cpp

@@ -117 +117 @@
 } ATSCLIENTINST;
 /** Pointer to a ATS client instance. */
-typedef ATSCLIENTINST *PATSSERVERINST;
+typedef ATSCLIENTINST *PATSCLIENTINST;
 
 /**
@@ -152 +152 @@
  *                              aligned buffer.
  */
-static int atsSendPkt(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPkt)
+static int atsSendPkt(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPkt)
 {
     Assert(pPkt->cb >= sizeof(*pPkt));
@@ -175 +175 @@
  * @param   pszOpcode           The BABBLE opcode.
  */
-static void atsReplyBabble(PATSSERVER pThis, PATSSERVERINST pInst, const char *pszOpcode)
+static void atsReplyBabble(PATSSERVER pThis, PATSCLIENTINST pInst, const char *pszOpcode)
 {
     ATSPKTHDR Reply;
@@ -198 +198 @@
  * @param   fAutoRetryOnFailure Whether to retry on error.
  */
-static int atsRecvPkt(PATSSERVER pThis, PATSSERVERINST pInst, PPATSPKTHDR ppPktHdr, bool fAutoRetryOnFailure)
+static int atsRecvPkt(PATSSERVER pThis, PATSCLIENTINST pInst, PPATSPKTHDR ppPktHdr, bool fAutoRetryOnFailure)
 {
     for (;;)
@@ -281 +281 @@
  * @param   cbExtra             Bytes in addition to the header.
  */
-static int atsReplyInternal(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pReply, const char *pszOpcode, size_t cbExtra)
+static int atsReplyInternal(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pReply, const char *pszOpcode, size_t cbExtra)
 {
     /* copy the opcode, don't be too strict in case of a padding screw up. */
@@ -313 +313 @@
  *                              with space.
  */
-static int atsReplySimple(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr, const char *pszOpcode)
+static int atsReplySimple(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr, const char *pszOpcode)
 {
     return atsReplyInternal(pThis, pInst, pPktHdr, pszOpcode, 0);
@@ -326 +326 @@
  * @param   pPktHdr             The original packet (for future use).
  */
-static int atsReplyAck(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsReplyAck(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     return atsReplySimple(pThis, pInst, pPktHdr, "ACK     ");
@@ -344 +344 @@
  * @param   va                  Format arguments.
  */
-static int atsReplyFailureV(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr,
+static int atsReplyFailureV(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr,
                             const char *pszOpcode, int rcReq, const char *pszDetailFmt, va_list va)
 {
@@ -378 +378 @@
  * @param   ...                 Format arguments.
  */
-static int atsReplyFailure(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr,
+static int atsReplyFailure(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr,
                            const char *pszOpcode, int rcReq, const char *pszDetailFmt, ...)
 {
@@ -401 +401 @@
  */
 static int atsReplyRC(PATSSERVER pThis,
-                      PATSSERVERINST pInst, PATSPKTHDR pPktHdr, int rcOperation, const char *pszOperationFmt, ...)
+                      PATSCLIENTINST pInst, PATSPKTHDR pPktHdr, int rcOperation, const char *pszOperationFmt, ...)
 {
     if (RT_SUCCESS(rcOperation))
@@ -425 +425 @@
  * @param   cb                  The wanted size.
  */
-static int atsReplyBadSize(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr, size_t cb)
+static int atsReplyBadSize(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr, size_t cb)
 {
     return atsReplyFailure(pThis, pInst, pPktHdr, "BAD SIZE", VERR_INVALID_PARAMETER, "Expected at %zu bytes, got %u  (opcode '%.8s')",
@@ -439 +439 @@
  * @param   pPktHdr             The packet to reply to.
  */
-static int atsReplyUnknown(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsReplyUnknown(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     return atsReplyFailure(pThis, pInst, pPktHdr, "UNKNOWN ", VERR_NOT_FOUND, "Opcode '%.8s' is not known", pPktHdr->achOpcode);
@@ -452 +452 @@
  * @param   pPktHdr             The packet containing the unterminated string.
  */
-static int atsReplyInvalidState(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsReplyInvalidState(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     return atsReplyFailure(pThis, pInst, pPktHdr, "INVSTATE", VERR_INVALID_STATE, "Opcode '%.8s' is not supported at client state '%s",
@@ -466 +466 @@
  * @param   pPktHdr             The bye packet.
  */
-static int atsDoBye(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoBye(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     int rc;
@@ -501 +501 @@
  * @param   pPktHdr             The howdy packet.
  */
-static int atsDoHowdy(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoHowdy(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     int rc = VINF_SUCCESS;
@@ -544 +544 @@
  * @param   pPktHdr             The test set begin packet.
  */
-static int atsDoTestSetBegin(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoTestSetBegin(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     if (pPktHdr->cb != sizeof(ATSPKTREQTSETBEG))
@@ -578 +578 @@
  * @param   pPktHdr             The test set end packet.
  */
-static int atsDoTestSetEnd(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoTestSetEnd(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     if (pPktHdr->cb != sizeof(ATSPKTREQTSETEND))
@@ -613 +613 @@
  * @param   pPktHdr             The original packet (for future use).
  */
-static int atsWaitForAck(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsWaitForAck(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     RT_NOREF(pPktHdr);
@@ -643 +643 @@
  * @param   pPktHdr             The test set end packet.
  */
-static int atsDoTestSetSend(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoTestSetSend(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     if (pPktHdr->cb != sizeof(ATSPKTREQTSETSND))
@@ -727 +727 @@
  * @param   pPktHdr             The packet header.
  */
-static int atsDoTonePlay(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoTonePlay(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     int rc = VINF_SUCCESS;
@@ -758 +758 @@
  * @param   pPktHdr             The packet header.
  */
-static int atsDoToneRecord(PATSSERVER pThis, PATSSERVERINST pInst, PATSPKTHDR pPktHdr)
+static int atsDoToneRecord(PATSSERVER pThis, PATSCLIENTINST pInst, PATSPKTHDR pPktHdr)
 {
     int rc = VINF_SUCCESS;
@@ -788 +788 @@
  * @param   pInst             The ATS client structure sending the request.
  */
-static int atsClientReqProcess(PATSSERVER pThis, PATSSERVERINST pInst)
+static int atsClientReqProcess(PATSSERVER pThis, PATSCLIENTINST pInst)
 {
     /*
@@ -833 +833 @@
  * @param   pInst               The opaque ATS instance structure.
  */
-static void atsClientDestroy(PATSSERVERINST pInst)
+static void atsClientDestroy(PATSCLIENTINST pInst)
 {
     if (pInst->pszHostname)
@@ -852 +852 @@
     unsigned    cClientsMax = 0;
     unsigned    cClientsCur = 0;
-    PATSSERVERINST *papInsts  = NULL;
+    PATSCLIENTINST *papInsts  = NULL;
 
     /* Add the pipe to the poll set. */
@@ -880 +880 @@
                     RTCritSectEnter(&pThis->CritSectClients);
                     /* Walk the list and add all new clients. */
-                    PATSSERVERINST pIt, pItNext;
+                    PATSCLIENTINST pIt, pItNext;
                     RTListForEachSafe(&pThis->LstClientsNew, pIt, pItNext, ATSCLIENTINST, NdLst)
                     {
@@ -888 +888 @@
                         {
                             /* Realloc to accommodate for the new clients. */
-                            PATSSERVERINST *papInstsNew = (PATSSERVERINST *)RTMemRealloc(papInsts, (cClientsMax + 10) * sizeof(PATSSERVERINST));
+                            PATSCLIENTINST *papInstsNew = (PATSCLIENTINST *)RTMemRealloc(papInsts, (cClientsMax + 10) * sizeof(PATSCLIENTINST));
                             if (RT_LIKELY(papInstsNew))
                             {
@@ -926 +926 @@
                 {
                     /* Client sends a request, pick the right client and process it. */
-                    PATSSERVERINST pInst = papInsts[uId - 1];
+                    PATSCLIENTINST pInst = papInsts[uId - 1];
                     AssertPtr(pInst);
                     if (fEvts & RTPOLL_EVT_READ)
@@ -982 +982 @@
          * the request handling thread.
          */
-        PATSSERVERINST pInst = (PATSSERVERINST)RTMemAllocZ(sizeof(ATSCLIENTINST));
+        PATSCLIENTINST pInst = (PATSCLIENTINST)RTMemAllocZ(sizeof(ATSCLIENTINST));
         if (RT_LIKELY(pInst))
         {
@@ -1195 +1195 @@
     pThis->hPollSet = NIL_RTPOLLSET;
 
-    PATSSERVERINST pIt, pItNext;
+    PATSCLIENTINST pIt, pItNext;
     RTListForEachSafe(&pThis->LstClientsNew, pIt, pItNext, ATSCLIENTINST, NdLst)
     {