Index: /trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp
===================================================================
--- /trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp	(revision 84627)
+++ /trunk/src/VBox/Debugger/DBGCGdbRemoteStub.cpp	(revision 84628)
@@ -109,5 +109,5 @@
     size_t                      cbPktBufMax;
     /** Current offset into the packet buffer. */
-    uint32_t                    offPktBuf;
+    size_t                      offPktBuf;
     /** The size of the packet (minus the start, end characters and the checksum). */
     uint32_t                    cbPkt;
@@ -293,5 +293,5 @@
  * @returns Status code.
  * @param   pThis               The GDB stub context.
- * @param   pbReplyData         The reply data to send.
+ * @param   pvReplyData         The reply data to send.
  * @param   cbReplyData         Size of the reply data in bytes.
  */
@@ -330,5 +330,5 @@
  * @returns Status code.
  * @param   pThis               The GDB stub context.
- * @param   pbReplyPkt          The reply packet to send.
+ * @param   pvReplyPkt          The reply packet to send.
  * @param   cbReplyPkt          Size of the reply packet in bytes.
  */
@@ -604,5 +604,5 @@
 
 /**
- * @copydoc{FNGDBSTUBQPKTPROC}
+ * @copydoc FNGDBSTUBQPKTPROC
  */
 static int dbgcGdbStubCtxPktProcessFeatXmlRegs(PGDBSTUBCTX pThis, const uint8_t *pbVal, size_t cbVal)
@@ -784,5 +784,5 @@
 
 /**
- * Sends the reply to a 'qXfer:<object>:read:...' request.
+ * Sends the reply to a 'qXfer:object:read:...' request.
  *
  * @returns Status code.
@@ -810,5 +810,5 @@
         }
         else
-            rc = dbgcGdbStubCtxReplySendErr(pThis, VERR_NO_MEMORY);
+            rc = dbgcGdbStubCtxReplySendErrSts(pThis, VERR_NO_MEMORY);
     }
     else if (offRead == cbObj)
@@ -822,13 +822,13 @@
 
 /**
- * Parses the annex:offset,length part of a 'qXfer:<object>:read:...' request.
- *
- * @returns Status code.
- * @param   pbArgs              Start of the arguments beginning with <annex>.
+ * Parses the annex:offset,length part of a 'qXfer:object:read:...' request.
+ *
+ * @returns Status code.
+ * @param   pbArgs              Start of the arguments beginning with annex.
  * @param   cbArgs              Number of bytes remaining for the arguments.
  * @param   ppchAnnex           Where to store the pointer to the beginning of the annex on success.
  * @param   pcchAnnex           Where to store the number of characters for the annex on success.
- * @param   poff                Where to store the offset on success.
- * @param   pcb                 Where to store the length on success.
+ * @param   poffRead            Where to store the offset on success.
+ * @param   pcbRead             Where to store the length on success.
  */
 static int dbgcGdbStubCtxPktProcessQueryXferParseAnnexOffLen(const uint8_t *pbArgs, size_t cbArgs, const char **ppchAnnex, size_t *pcchAnnex,
@@ -1456,5 +1456,5 @@
                 {
                     size_t cbProcessed = pbPktSep - &pThis->pbPktBuf[2];
-                    size_t cbRead = 0;
+                    uint64_t cbRead = 0;
                     rc = dbgcGdbStubCtxParseHexStringAsInteger(pbPktSep + 1, pThis->cbPkt - 1 - cbProcessed - 1, &cbRead, GDBSTUB_PKT_END, NULL);
                     if (RT_SUCCESS(rc))
@@ -1516,5 +1516,5 @@
                 {
                     size_t cbProcessed = pbPktSep - &pThis->pbPktBuf[2];
-                    size_t cbWrite = 0;
+                    uint64_t cbWrite = 0;
                     rc = dbgcGdbStubCtxParseHexStringAsInteger(pbPktSep + 1, pThis->cbPkt - 1 - cbProcessed - 1, &cbWrite, ':', &pbPktSep);
                     if (RT_SUCCESS(rc))
@@ -2166,5 +2166,5 @@
  *
  * @returns VBox status code.
- * @param   pDbgc   Pointer to the debugger console instance data.
+ * @param   pThis   Pointer to the GDB stub context.
  */
 int dbgcGdbStubRun(PGDBSTUBCTX pThis)