summaryrefslogtreecommitdiff
path: root/src/VBox/Storage
diff options
context:
space:
mode:
Diffstat (limited to 'src/VBox/Storage')
-rw-r--r--src/VBox/Storage/CUE.cpp10
-rw-r--r--src/VBox/Storage/ISCSI.cpp1
-rw-r--r--src/VBox/Storage/QCOW.cpp15
-rw-r--r--src/VBox/Storage/QED.cpp31
-rw-r--r--src/VBox/Storage/VCICache.cpp2
-rw-r--r--src/VBox/Storage/VD.cpp6
-rw-r--r--src/VBox/Storage/VDI.cpp1
-rw-r--r--src/VBox/Storage/VHDX.cpp19
-rw-r--r--src/VBox/Storage/VMDK.cpp2
-rw-r--r--src/VBox/Storage/testcase/VDIoBackend.h4
-rw-r--r--src/VBox/Storage/testcase/VDIoBackendMem.h4
-rw-r--r--src/VBox/Storage/testcase/VDMemDisk.h2
-rw-r--r--src/VBox/Storage/testcase/VDScript.cpp16
-rw-r--r--src/VBox/Storage/testcase/VDScript.h1
-rw-r--r--src/VBox/Storage/testcase/VDScriptAst.cpp2
-rw-r--r--src/VBox/Storage/testcase/VDScriptAst.h1
-rw-r--r--src/VBox/Storage/testcase/VDScriptInterp.cpp2
-rw-r--r--src/VBox/Storage/testcase/VDScriptStack.h4
-rw-r--r--src/VBox/Storage/testcase/tstVDIo.cpp5
19 files changed, 17 insertions, 111 deletions
diff --git a/src/VBox/Storage/CUE.cpp b/src/VBox/Storage/CUE.cpp
index ac6b1691ec8..d374db20b86 100644
--- a/src/VBox/Storage/CUE.cpp
+++ b/src/VBox/Storage/CUE.cpp
@@ -333,7 +333,6 @@ DECLINLINE(bool) cueTokenizerIsEos(PCUETOKENIZER pTokenizer)
/**
* Skip one character in the input stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) cueTokenizerSkipCh(PCUETOKENIZER pTokenizer)
@@ -378,7 +377,6 @@ DECLINLINE(char) cueTokenizerGetCh(PCUETOKENIZER pTokenizer)
/**
* Sets a new line for the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param cSkip How many characters to skip.
*/
@@ -414,7 +412,6 @@ DECLINLINE(bool) cueTokenizerIsSkipNewLine(PCUETOKENIZER pTokenizer)
* Skip all whitespace starting from the current input buffer position.
* Skips all present comments too.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) cueTokenizerSkipWhitespace(PCUETOKENIZER pTokenizer)
@@ -434,7 +431,6 @@ DECLINLINE(void) cueTokenizerSkipWhitespace(PCUETOKENIZER pTokenizer)
/**
* Skips a multi line comment.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) cueTokenizerSkipComment(PCUETOKENIZER pTokenizer)
@@ -448,7 +444,6 @@ DECLINLINE(void) cueTokenizerSkipComment(PCUETOKENIZER pTokenizer)
/**
* Get an identifier token from the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -511,7 +506,6 @@ static void cueTokenizerGetKeyword(PCUETOKENIZER pTokenizer, PCUETOKEN pToken)
/**
* Get an integer value or MSF location indicator from the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -576,7 +570,6 @@ static void cueTokenizerGetIntegerOrMsf(PCUETOKENIZER pTokenizer, PCUETOKEN pTok
/**
* Parses a string constant.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*
@@ -612,7 +605,6 @@ static void cueTokenizerGetStringConst(PCUETOKENIZER pTokenizer, PCUETOKEN pToke
/**
* Get the end of stream token.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -626,7 +618,6 @@ static void cueTokenizerGetEos(PCUETOKENIZER pTokenizer, PCUETOKEN pToken)
/**
* Read the next token from the tokenizer stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer to read from.
* @param pToken Uninitialized token to fill the token data into.
*/
@@ -696,7 +687,6 @@ DECLINLINE(CUETOKENTYPE) cueTokenizerGetTokenType(PCUETOKENIZER pTokenizer)
/**
* Consume the current token advancing to the next in the stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
static void cueTokenizerConsume(PCUETOKENIZER pTokenizer)
diff --git a/src/VBox/Storage/ISCSI.cpp b/src/VBox/Storage/ISCSI.cpp
index d6adba34895..f86956b33bc 100644
--- a/src/VBox/Storage/ISCSI.cpp
+++ b/src/VBox/Storage/ISCSI.cpp
@@ -838,7 +838,6 @@ static PISCSICMD iscsiCmdRemoveAll(PISCSIIMAGE pImage)
/**
* Dumps an iSCSI packet if enabled.
*
- * @returns nothing.
* @param pImage The iSCSI image instance data.
* @param paISCSISegs Pointer to the segments array.
* @param cnISCSISegs Number of segments in the array.
diff --git a/src/VBox/Storage/QCOW.cpp b/src/VBox/Storage/QCOW.cpp
index 1a234bab0b1..bd32033152a 100644
--- a/src/VBox/Storage/QCOW.cpp
+++ b/src/VBox/Storage/QCOW.cpp
@@ -453,7 +453,6 @@ static bool qcowHdrConvertToHostEndianess(PQCowHeader pHeader)
/**
* Creates a QCOW header from the given image state.
*
- * @returns nothing.
* @param pImage Image instance data.
* @param pHeader Pointer to the header to convert.
* @param pcbHeader Where to store the size of the header to write.
@@ -499,13 +498,12 @@ static void qcowHdrConvertFromHostEndianess(PQCOWIMAGE pImage, PQCowHeader pHead
/**
* Convert table entries from little endian to host endianess.
*
- * @returns nothing.
* @param paTbl Pointer to the table.
* @param cEntries Number of entries in the table.
*/
static void qcowTableConvertToHostEndianess(uint64_t *paTbl, uint32_t cEntries)
{
- while(cEntries-- > 0)
+ while (cEntries-- > 0)
{
*paTbl = RT_BE2H_U64(*paTbl);
paTbl++;
@@ -515,15 +513,14 @@ static void qcowTableConvertToHostEndianess(uint64_t *paTbl, uint32_t cEntries)
/**
* Convert table entries from host to little endian format.
*
- * @returns nothing.
* @param paTblImg Pointer to the table which will store the little endian table.
* @param paTbl The source table to convert.
* @param cEntries Number of entries in the table.
*/
-static void qcowTableConvertFromHostEndianess(uint64_t *paTblImg, uint64_t *paTbl,
+static void qcowTableConvertFromHostEndianess(uint64_t *paTblImg, uint64_t const *paTbl,
uint32_t cEntries)
{
- while(cEntries-- > 0)
+ while (cEntries-- > 0)
{
*paTblImg = RT_H2BE_U64(*paTbl);
paTbl++;
@@ -549,7 +546,6 @@ static int qcowL2TblCacheCreate(PQCOWIMAGE pImage)
/**
* Destroys the L2 table cache.
*
- * @returns nothing.
* @param pImage The image instance data.
*/
static void qcowL2TblCacheDestroy(PQCOWIMAGE pImage)
@@ -608,7 +604,6 @@ static PQCOWL2CACHEENTRY qcowL2TblCacheRetain(PQCOWIMAGE pImage, uint64_t offL2T
/**
* Releases a L2 table cache entry.
*
- * @returns nothing.
* @param pL2Entry The L2 cache entry.
*/
static void qcowL2TblCacheEntryRelease(PQCOWL2CACHEENTRY pL2Entry)
@@ -674,7 +669,6 @@ static PQCOWL2CACHEENTRY qcowL2TblCacheEntryAlloc(PQCOWIMAGE pImage)
/**
* Frees a L2 table cache entry.
*
- * @returns nothing.
* @param pImage The image instance data.
* @param pL2Entry The L2 cache entry to free.
*/
@@ -690,7 +684,6 @@ static void qcowL2TblCacheEntryFree(PQCOWIMAGE pImage, PQCOWL2CACHEENTRY pL2Entr
/**
* Inserts an entry in the L2 table cache.
*
- * @returns nothing.
* @param pImage The image instance data.
* @param pL2Entry The L2 cache entry to insert.
*/
@@ -789,7 +782,6 @@ static int qcowL2TblCacheFetch(PQCOWIMAGE pImage, PVDIOCTX pIoCtx, uint64_t offL
/**
* Sets the L1, L2 and offset bitmasks and L1 and L2 bit shift members.
*
- * @returns nothing.
* @param pImage The image instance data.
*/
static void qcowTableMasksInit(PQCOWIMAGE pImage)
@@ -810,7 +802,6 @@ static void qcowTableMasksInit(PQCOWIMAGE pImage)
/**
* Converts a given logical offset into the
*
- * @returns nothing.
* @param pImage The image instance data.
* @param off The logical offset to convert.
* @param pidxL1 Where to store the index in the L1 table on success.
diff --git a/src/VBox/Storage/QED.cpp b/src/VBox/Storage/QED.cpp
index a973b8916ed..f9308a07dcd 100644
--- a/src/VBox/Storage/QED.cpp
+++ b/src/VBox/Storage/QED.cpp
@@ -1,6 +1,13 @@
/* $Id$ */
/** @file
* QED - QED Disk image.
+ *
+ * The QED backend implements support for the qemu enhanced disk format (short QED)
+ * The specification for the format is available under http://wiki.qemu.org/Features/QED/Specification
+ *
+ * Missing things to implement:
+ * - compaction
+ * - resizing which requires block relocation (very rare case)
*/
/*
@@ -44,15 +51,6 @@
#include "VDBackends.h"
#include "VDBackendsInline.h"
-/**
- * The QED backend implements support for the qemu enhanced disk format (short QED)
- * The specification for the format is available under http://wiki.qemu.org/Features/QED/Specification
- *
- * Missing things to implement:
- * - compaction
- * - resizing which requires block relocation (very rare case)
- */
-
/*********************************************************************************************************************************
* Structures in a QED image, little endian *
@@ -329,7 +327,6 @@ static bool qedHdrConvertToHostEndianess(PQedHeader pHeader)
/**
* Creates a QED header from the given image state.
*
- * @returns nothing.
* @param pImage Image instance data.
* @param pHeader Pointer to the header to convert.
*/
@@ -351,13 +348,12 @@ static void qedHdrConvertFromHostEndianess(PQEDIMAGE pImage, PQedHeader pHeader)
/**
* Convert table entries from little endian to host endianess.
*
- * @returns nothing.
* @param paTbl Pointer to the table.
* @param cEntries Number of entries in the table.
*/
static void qedTableConvertToHostEndianess(uint64_t *paTbl, uint32_t cEntries)
{
- while(cEntries-- > 0)
+ while (cEntries-- > 0)
{
*paTbl = RT_LE2H_U64(*paTbl);
paTbl++;
@@ -368,15 +364,14 @@ static void qedTableConvertToHostEndianess(uint64_t *paTbl, uint32_t cEntries)
/**
* Convert table entries from host to little endian format.
*
- * @returns nothing.
* @param paTblImg Pointer to the table which will store the little endian table.
* @param paTbl The source table to convert.
* @param cEntries Number of entries in the table.
*/
-static void qedTableConvertFromHostEndianess(uint64_t *paTblImg, uint64_t *paTbl,
+static void qedTableConvertFromHostEndianess(uint64_t *paTblImg, uint64_t const *paTbl,
uint32_t cEntries)
{
- while(cEntries-- > 0)
+ while (cEntries-- > 0)
{
*paTblImg = RT_H2LE_U64(*paTbl);
paTbl++;
@@ -403,7 +398,6 @@ static int qedL2TblCacheCreate(PQEDIMAGE pImage)
/**
* Destroys the L2 table cache.
*
- * @returns nothing.
* @param pImage The image instance data.
*/
static void qedL2TblCacheDestroy(PQEDIMAGE pImage)
@@ -462,7 +456,6 @@ static PQEDL2CACHEENTRY qedL2TblCacheRetain(PQEDIMAGE pImage, uint64_t offL2Tbl)
/**
* Releases a L2 table cache entry.
*
- * @returns nothing.
* @param pL2Entry The L2 cache entry.
*/
static void qedL2TblCacheEntryRelease(PQEDL2CACHEENTRY pL2Entry)
@@ -528,7 +521,6 @@ static PQEDL2CACHEENTRY qedL2TblCacheEntryAlloc(PQEDIMAGE pImage)
/**
* Frees a L2 table cache entry.
*
- * @returns nothing.
* @param pImage The image instance data.
* @param pL2Entry The L2 cache entry to free.
*/
@@ -544,7 +536,6 @@ static void qedL2TblCacheEntryFree(PQEDIMAGE pImage, PQEDL2CACHEENTRY pL2Entry)
/**
* Inserts an entry in the L2 table cache.
*
- * @returns nothing.
* @param pImage The image instance data.
* @param pL2Entry The L2 cache entry to insert.
*/
@@ -662,7 +653,6 @@ static uint32_t qedGetPowerOfTwo(uint32_t u32)
/**
* Sets the L1, L2 and offset bitmasks and L1 and L2 bit shift members.
*
- * @returns nothing.
* @param pImage The image instance data.
*/
static void qedTableMasksInit(PQEDIMAGE pImage)
@@ -684,7 +674,6 @@ static void qedTableMasksInit(PQEDIMAGE pImage)
/**
* Converts a given logical offset into the
*
- * @returns nothing.
* @param pImage The image instance data.
* @param off The logical offset to convert.
* @param pidxL1 Where to store the index in the L1 table on success.
diff --git a/src/VBox/Storage/VCICache.cpp b/src/VBox/Storage/VCICache.cpp
index 579ad00d57a..99b17ffef4a 100644
--- a/src/VBox/Storage/VCICache.cpp
+++ b/src/VBox/Storage/VCICache.cpp
@@ -506,7 +506,6 @@ static int vciBlkMapCreate(uint64_t cBlocks, PVCIBLKMAP *ppBlkMap, uint32_t *pcB
/**
* Frees a block map.
*
- * @returns nothing.
* @param pBlkMap The block bitmap to destroy.
*/
static void vciBlkMapDestroy(PVCIBLKMAP pBlkMap)
@@ -925,7 +924,6 @@ static int vciBlkMapRealloc(PVCIBLKMAP pBlkMap, uint32_t cBlocksNew, uint64_t of
/**
* Frees a range of blocks.
*
- * @returns nothing.
* @param pBlkMap The block bitmap.
* @param offBlockAddr Address of the first block to free.
* @param cBlocks How many blocks to free.
diff --git a/src/VBox/Storage/VD.cpp b/src/VBox/Storage/VD.cpp
index 31947d4facd..94ade76f2b2 100644
--- a/src/VBox/Storage/VD.cpp
+++ b/src/VBox/Storage/VD.cpp
@@ -1486,7 +1486,6 @@ static int vdDiskProcessWaitingIoCtx(PVDISK pDisk, PVDIOCTX pIoCtxRc)
/**
* Processes the list of blocked I/O contexts.
*
- * @returns nothing.
* @param pDisk The disk structure.
*/
static void vdDiskProcessBlockedIoCtx(PVDISK pDisk)
@@ -3604,7 +3603,6 @@ static int vdMetaXferCompleted(PVDIOSTORAGE pIoStorage, PFNVDXFERCOMPLETED pfnCo
/**
* Processes a list of waiting I/O tasks. The disk lock must be held by caller.
*
- * @returns nothing.
* @param pDisk The disk to process the list for.
*/
static void vdIoTaskProcessWaitingList(PVDISK pDisk)
@@ -3649,7 +3647,6 @@ static void vdIoTaskProcessWaitingList(PVDISK pDisk)
/**
* Process any I/O context on the halted list.
*
- * @returns nothing.
* @param pDisk The disk.
*/
static void vdIoCtxProcessHaltedList(PVDISK pDisk)
@@ -3739,7 +3736,6 @@ static int vdDiskUnlock(PVDISK pDisk, PVDIOCTX pIoCtxRc)
* Try to lock the disk to complete pressing of the I/O task.
* The completion is deferred if the disk is locked already.
*
- * @returns nothing.
* @param pIoTask The I/O task to complete.
*/
static void vdXferTryLockDiskDeferIoTask(PVDIOTASK pIoTask)
@@ -4933,7 +4929,6 @@ static void vdFixupLCHSGeometry(PVDGEOMETRY pLCHS, uint64_t cbSize)
/**
* Sets the I/O callbacks of the given interface to the fallback methods
*
- * @returns nothing.
* @param pIfIo The I/O interface to setup.
*/
static void vdIfIoFallbackCallbacksSetup(PVDINTERFACEIO pIfIo)
@@ -4958,7 +4953,6 @@ static void vdIfIoFallbackCallbacksSetup(PVDINTERFACEIO pIfIo)
/**
* Sets the internal I/O callbacks of the given interface.
*
- * @returns nothing.
* @param pIfIoInt The internal I/O interface to setup.
*/
static void vdIfIoIntCallbacksSetup(PVDINTERFACEIOINT pIfIoInt)
diff --git a/src/VBox/Storage/VDI.cpp b/src/VBox/Storage/VDI.cpp
index c959d1b654c..66ad0f00df1 100644
--- a/src/VBox/Storage/VDI.cpp
+++ b/src/VBox/Storage/VDI.cpp
@@ -350,7 +350,6 @@ static unsigned vdiTranslateVDI2ImageFlags(VDIIMAGETYPE enmType)
/**
* Internal: Init VDI header. Always use latest header version.
*
- * @returns nothing.
* @param pHeader Assumes it was initially initialized to all zeros.
* @param uImageFlags Flags for this image.
* @param pszComment Optional comment to set for the image.
diff --git a/src/VBox/Storage/VHDX.cpp b/src/VBox/Storage/VHDX.cpp
index e43573af95c..65b8b4668a8 100644
--- a/src/VBox/Storage/VHDX.cpp
+++ b/src/VBox/Storage/VHDX.cpp
@@ -616,7 +616,6 @@ static const VHDXMETADATAITEMPROPS s_aVhdxMetadataItemProps[] =
/**
* Converts the file identifier between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pFileIdentifierConv Where to store the converted file identifier.
* @param pFileIdentifier The file identifier to convert.
@@ -634,7 +633,6 @@ DECLINLINE(void) vhdxConvFileIdentifierEndianess(VHDXECONV enmConv, PVhdxFileIde
/**
* Converts a UUID between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pUuidConv Where to store the converted UUID.
* @param pUuid The UUID to convert.
@@ -664,7 +662,6 @@ DECLINLINE(void) vhdxConvUuidEndianess(VHDXECONV enmConv, PRTUUID pUuidConv, PRT
/**
* Converts a VHDX header between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pHdrConv Where to store the converted header.
* @param pHdr The VHDX header to convert.
@@ -688,7 +685,6 @@ DECLINLINE(void) vhdxConvHeaderEndianess(VHDXECONV enmConv, PVhdxHeader pHdrConv
/**
* Converts a VHDX region table header between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pRegTblHdrConv Where to store the converted header.
* @param pRegTblHdr The VHDX region table header to convert.
@@ -707,7 +703,6 @@ DECLINLINE(void) vhdxConvRegionTblHdrEndianess(VHDXECONV enmConv, PVhdxRegionTbl
/**
* Converts a VHDX region table entry between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pRegTblEntConv Where to store the converted region table entry.
* @param pRegTblEnt The VHDX region table entry to convert.
@@ -728,7 +723,6 @@ DECLINLINE(void) vhdxConvRegionTblEntryEndianess(VHDXECONV enmConv, PVhdxRegionT
/**
* Converts a VHDX log entry header between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pLogEntryHdrConv Where to store the converted log entry header.
* @param pLogEntryHdr The VHDX log entry header to convert.
@@ -752,7 +746,6 @@ DECLINLINE(void) vhdxConvLogEntryHdrEndianess(VHDXECONV enmConv, PVhdxLogEntryHd
/**
* Converts a VHDX log zero descriptor between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pLogZeroDescConv Where to store the converted log zero descriptor.
* @param pLogZeroDesc The VHDX log zero descriptor to convert.
@@ -773,7 +766,6 @@ DECLINLINE(void) vhdxConvLogZeroDescEndianess(VHDXECONV enmConv, PVhdxLogZeroDes
/**
* Converts a VHDX log data descriptor between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pLogDataDescConv Where to store the converted log data descriptor.
* @param pLogDataDesc The VHDX log data descriptor to convert.
@@ -794,7 +786,6 @@ DECLINLINE(void) vhdxConvLogDataDescEndianess(VHDXECONV enmConv, PVhdxLogDataDes
/**
* Converts a VHDX log data sector between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pLogDataSectorConv Where to store the converted log data sector.
* @param pLogDataSector The VHDX log data sector to convert.
@@ -814,7 +805,6 @@ DECLINLINE(void) vhdxConvLogDataSectorEndianess(VHDXECONV enmConv, PVhdxLogDataS
/**
* Converts a BAT between file and host endianess.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param paBatEntriesConv Where to store the converted BAT.
* @param paBatEntries The VHDX BAT to convert.
@@ -832,7 +822,6 @@ DECLINLINE(void) vhdxConvBatTableEndianess(VHDXECONV enmConv, PVhdxBatEntry paBa
/**
* Converts a VHDX metadata table header between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pMetadataTblHdrConv Where to store the converted metadata table header.
* @param pMetadataTblHdr The VHDX metadata table header to convert.
@@ -852,7 +841,6 @@ DECLINLINE(void) vhdxConvMetadataTblHdrEndianess(VHDXECONV enmConv, PVhdxMetadat
/**
* Converts a VHDX metadata table entry between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pMetadataTblEntryConv Where to store the converted metadata table entry.
* @param pMetadataTblEntry The VHDX metadata table entry to convert.
@@ -872,7 +860,6 @@ DECLINLINE(void) vhdxConvMetadataTblEntryEndianess(VHDXECONV enmConv, PVhdxMetad
/**
* Converts a VHDX file parameters item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pFileParamsConv Where to store the converted file parameters item entry.
* @param pFileParams The VHDX file parameters item to convert.
@@ -889,7 +876,6 @@ DECLINLINE(void) vhdxConvFileParamsEndianess(VHDXECONV enmConv, PVhdxFileParamet
/**
* Converts a VHDX virtual disk size item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pVDiskSizeConv Where to store the converted virtual disk size item entry.
* @param pVDiskSize The VHDX virtual disk size item to convert.
@@ -907,7 +893,6 @@ DECLINLINE(void) vhdxConvVDiskSizeEndianess(VHDXECONV enmConv, PVhdxVDiskSize pV
/**
* Converts a VHDX page 83 data item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pPage83DataConv Where to store the converted page 83 data item entry.
* @param pPage83Data The VHDX page 83 data item to convert.
@@ -924,7 +909,6 @@ DECLINLINE(void) vhdxConvPage83DataEndianess(VHDXECONV enmConv, PVhdxPage83Data
/**
* Converts a VHDX logical sector size item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pVDiskLogSectSizeConv Where to store the converted logical sector size item entry.
* @param pVDiskLogSectSize The VHDX logical sector size item to convert.
@@ -942,7 +926,6 @@ DECLINLINE(void) vhdxConvVDiskLogSectSizeEndianess(VHDXECONV enmConv, PVhdxVDisk
/**
* Converts a VHDX physical sector size item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pVDiskPhysSectSizeConv Where to store the converted physical sector size item entry.
* @param pVDiskPhysSectSize The VHDX physical sector size item to convert.
@@ -959,7 +942,6 @@ DECLINLINE(void) vhdxConvVDiskPhysSectSizeEndianess(VHDXECONV enmConv, PVhdxVDis
/**
* Converts a VHDX parent locator header item between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pParentLocatorHdrConv Where to store the converted parent locator header item entry.
* @param pParentLocatorHdr The VHDX parent locator header item to convert.
@@ -978,7 +960,6 @@ DECLINLINE(void) vhdxConvParentLocatorHeaderEndianness(VHDXECONV enmConv, PVhdxP
/**
* Converts a VHDX parent locator entry between file and host endianness.
*
- * @returns nothing.
* @param enmConv Direction of the conversion.
* @param pParentLocatorEntryConv Where to store the converted parent locator entry.
* @param pParentLocatorEntry The VHDX parent locator entry to convert.
diff --git a/src/VBox/Storage/VMDK.cpp b/src/VBox/Storage/VMDK.cpp
index 9d8bf8e4e9a..11a27cb677c 100644
--- a/src/VBox/Storage/VMDK.cpp
+++ b/src/VBox/Storage/VMDK.cpp
@@ -1165,7 +1165,6 @@ static int vmdkAllocGrainDirectory(PVMDKIMAGE pImage, PVMDKEXTENT pExtent)
/**
* Converts the grain directory from little to host endianess.
*
- * @returns nothing.
* @param pGD The grain directory.
* @param cGDEntries Number of entries in the grain directory to convert.
*/
@@ -7370,7 +7369,6 @@ static int vmdkRenameStatePrepare(PVMDKIMAGE pImage, PVMDKRENAMESTATE pRenameSta
/**
* Destroys the given rename state, freeing all allocated memory.
*
- * @returns nothing.
* @param pRenameState The rename state to destroy.
*/
static void vmdkRenameStateDestroy(PVMDKRENAMESTATE pRenameState)
diff --git a/src/VBox/Storage/testcase/VDIoBackend.h b/src/VBox/Storage/testcase/VDIoBackend.h
index eb19ffc5216..4c0de108d95 100644
--- a/src/VBox/Storage/testcase/VDIoBackend.h
+++ b/src/VBox/Storage/testcase/VDIoBackend.h
@@ -49,7 +49,7 @@ typedef PVDIOSTORAGE *PPVDIOSTORAGE;
/**
* Completion handler.
*
- * @returns nothing.
+ * @returns IPRT status code.
* @param pvUser Opaque user data.
* @param rcReq Completion code for the request.
*/
@@ -69,8 +69,6 @@ int VDIoBackendCreate(PPVDIOBACKEND ppIoBackend);
/**
* Destroys a memory I/O backend.
*
- * @returns nothing.
- *
* @param pIoBackend The backend to destroy.
*/
void VDIoBackendDestroy(PVDIOBACKEND pIoBackend);
diff --git a/src/VBox/Storage/testcase/VDIoBackendMem.h b/src/VBox/Storage/testcase/VDIoBackendMem.h
index 8d96f27990b..bc0aba3df32 100644
--- a/src/VBox/Storage/testcase/VDIoBackendMem.h
+++ b/src/VBox/Storage/testcase/VDIoBackendMem.h
@@ -43,8 +43,8 @@ typedef PVDIOBACKENDMEM *PPVDIOBACKENDMEM;
/**
* Completion handler.
- *
- * @returns nothing.
+ *
+ * @returns IPRT status code.
* @param pvUser Opaque user data.
* @param rcReq Completion code for the request.
*/
diff --git a/src/VBox/Storage/testcase/VDMemDisk.h b/src/VBox/Storage/testcase/VDMemDisk.h
index ea74daeca94..cae29133412 100644
--- a/src/VBox/Storage/testcase/VDMemDisk.h
+++ b/src/VBox/Storage/testcase/VDMemDisk.h
@@ -54,8 +54,6 @@ int VDMemDiskCreate(PPVDMEMDISK ppMemDisk, uint64_t cbSize);
/**
* Destroys a memory disk.
*
- * @returns nothing.
- *
* @param pMemDisk The memory disk to destroy.
*/
void VDMemDiskDestroy(PVDMEMDISK pMemDisk);
diff --git a/src/VBox/Storage/testcase/VDScript.cpp b/src/VBox/Storage/testcase/VDScript.cpp
index 6e63cb5e4b4..81a6877eb69 100644
--- a/src/VBox/Storage/testcase/VDScript.cpp
+++ b/src/VBox/Storage/testcase/VDScript.cpp
@@ -337,7 +337,6 @@ DECLINLINE(bool) vdScriptTokenizerIsEos(PVDTOKENIZER pTokenizer)
/**
* Skip one character in the input stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) vdScriptTokenizerSkipCh(PVDTOKENIZER pTokenizer)
@@ -382,7 +381,6 @@ DECLINLINE(char) vdScriptTokenizerGetCh(PVDTOKENIZER pTokenizer)
/**
* Sets a new line for the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) vdScriptTokenizerNewLine(PVDTOKENIZER pTokenizer, unsigned cSkip)
@@ -419,7 +417,6 @@ DECLINLINE(bool) vdScriptTokenizerIsSkipNewLine(PVDTOKENIZER pTokenizer)
/**
* Skips a multi line comment.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) vdScriptTokenizerSkipComment(PVDTOKENIZER pTokenizer)
@@ -442,7 +439,6 @@ DECLINLINE(void) vdScriptTokenizerSkipComment(PVDTOKENIZER pTokenizer)
* Skip all whitespace starting from the current input buffer position.
* Skips all present comments too.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
DECLINLINE(void) vdScriptTokenizerSkipWhitespace(PVDTOKENIZER pTokenizer)
@@ -472,7 +468,6 @@ DECLINLINE(void) vdScriptTokenizerSkipWhitespace(PVDTOKENIZER pTokenizer)
/**
* Get an identifier token from the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -519,7 +514,6 @@ static void vdScriptTokenizerGetIdeOrKeyword(PVDTOKENIZER pTokenizer, PVDSCRIPTT
/**
* Get a numerical constant from the tokenizer.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -565,11 +559,10 @@ static void vdScriptTokenizerGetNumberConst(PVDTOKENIZER pTokenizer, PVDSCRIPTTO
/**
* Parses a string constant.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*
- * @remarks: No escape sequences allowed at this time.
+ * @remarks No escape sequences allowed at this time.
*/
static void vdScriptTokenizerGetStringConst(PVDTOKENIZER pTokenizer, PVDSCRIPTTOKEN pToken)
{
@@ -597,7 +590,6 @@ static void vdScriptTokenizerGetStringConst(PVDTOKENIZER pTokenizer, PVDSCRIPTTO
/**
* Get the end of stream token.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -612,7 +604,6 @@ static void vdScriptTokenizerGetEos(PVDTOKENIZER pTokenizer, PVDSCRIPTTOKEN pTok
/**
* Get operator or punctuator token.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
* @param pToken The uninitialized token.
*/
@@ -668,7 +659,6 @@ static void vdScriptTokenizerGetOperatorOrPunctuator(PVDTOKENIZER pTokenizer, PV
/**
* Read the next token from the tokenizer stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer to read from.
* @param pToken Uninitialized token to fill the token data into.
*/
@@ -720,7 +710,6 @@ static PVDTOKENIZER vdScriptTokenizerCreate(const char *pszInput)
/**
* Destroys a given tokenizer state.
*
- * @returns nothing.
* @param pTokenizer The tokenizer to destroy.
*/
static void vdScriptTokenizerDestroy(PVDTOKENIZER pTokenizer)
@@ -765,7 +754,6 @@ DECLINLINE(VDTOKENCLASS) vdScriptTokenizerPeekNextClass(PVDTOKENIZER pTokenizer)
/**
* Consume the current token advancing to the next in the stream.
*
- * @returns nothing.
* @param pTokenizer The tokenizer state.
*/
static void vdScriptTokenizerConsume(PVDTOKENIZER pTokenizer)
@@ -1320,7 +1308,6 @@ static int vdScriptParseUnaryExpression(PVDSCRIPTCTXINT pThis, PVDSCRIPTASTEXPR
/**
* Parse a storage class specifier.
*
- * @returns nothing.
* @param pThis The script context.
* @param penmStorageClass Where to return the parsed storage classe.
* Contains VDSCRIPTASTSTORAGECLASS_INVALID if no
@@ -1354,7 +1341,6 @@ static void vdScriptParseStorageClassSpecifier(PVDSCRIPTCTXINT pThis, PVDSCRIPTA
/**
* Parse a type qualifier.
*
- * @returns nothing.
* @param pThis The script context.
* @param penmTypeQualifier Where to return the parsed type qualifier.
* Contains VDSCRIPTASTTYPEQUALIFIER_INVALID if no
diff --git a/src/VBox/Storage/testcase/VDScript.h b/src/VBox/Storage/testcase/VDScript.h
index f23cb1f538e..d6611b32e50 100644
--- a/src/VBox/Storage/testcase/VDScript.h
+++ b/src/VBox/Storage/testcase/VDScript.h
@@ -165,7 +165,6 @@ DECLHIDDEN(int) VDScriptCtxCreate(PVDSCRIPTCTX phScriptCtx);
/**
* Destroys the given scripting context.
*
- * @returns nothing.
* @param hScriptCtx The script context to destroy.
*/
DECLHIDDEN(void) VDScriptCtxDestroy(VDSCRIPTCTX hScriptCtx);
diff --git a/src/VBox/Storage/testcase/VDScriptAst.cpp b/src/VBox/Storage/testcase/VDScriptAst.cpp
index 77ca4c33eb2..06fcc18bce2 100644
--- a/src/VBox/Storage/testcase/VDScriptAst.cpp
+++ b/src/VBox/Storage/testcase/VDScriptAst.cpp
@@ -37,7 +37,6 @@
/**
* Put all child nodes of the given expression AST node onto the given to free list.
*
- * @returns nothing.
* @param pList The free list to append everything to.
* @param pAstNode The expression node to free.
*/
@@ -146,7 +145,6 @@ static void vdScriptAstNodeExpressionPutOnFreeList(PRTLISTANCHOR pList, PVDSCRIP
/**
* Free a given statement AST node and put everything on the given to free list.
*
- * @returns nothing.
* @param pList The free list to append everything to.
* @param pAstNode The statement node to free.
*/
diff --git a/src/VBox/Storage/testcase/VDScriptAst.h b/src/VBox/Storage/testcase/VDScriptAst.h
index d57bf640f1c..5b58a36d515 100644
--- a/src/VBox/Storage/testcase/VDScriptAst.h
+++ b/src/VBox/Storage/testcase/VDScriptAst.h
@@ -568,7 +568,6 @@ typedef VDSCRIPTASTFN *PVDSCRIPTASTFN;
* Free the given AST node and all subsequent nodes pointed to
* by the given node.
*
- * @returns nothing.
* @param pAstNode The AST node to free.
*/
DECLHIDDEN(void) vdScriptAstNodeFree(PVDSCRIPTASTCORE pAstNode);
diff --git a/src/VBox/Storage/testcase/VDScriptInterp.cpp b/src/VBox/Storage/testcase/VDScriptInterp.cpp
index 216410d9f37..ce5e7f41f74 100644
--- a/src/VBox/Storage/testcase/VDScriptInterp.cpp
+++ b/src/VBox/Storage/testcase/VDScriptInterp.cpp
@@ -184,7 +184,6 @@ static int vdScriptInterpreterError(PVDSCRIPTINTERPCTX pThis, int rc, RT_SRC_POS
/**
* Pops the topmost value from the value stack.
*
- * @returns nothing.
* @param pThis The interpreter context.
* @param pVal Where to store the value.
*/
@@ -429,7 +428,6 @@ static int vdScriptInterpreterScopeCreate(PVDSCRIPTINTERPCTX pThis)
/**
* Destroys the current scope.
*
- * @returns nothing.
* @param pThis The interpreter context.
*/
static void vdScriptInterpreterScopeDestroyCurr(PVDSCRIPTINTERPCTX pThis)
diff --git a/src/VBox/Storage/testcase/VDScriptStack.h b/src/VBox/Storage/testcase/VDScriptStack.h
index bc758e9d669..1d39591e928 100644
--- a/src/VBox/Storage/testcase/VDScriptStack.h
+++ b/src/VBox/Storage/testcase/VDScriptStack.h
@@ -56,7 +56,6 @@ typedef VDSCRIPTSTACK *PVDSCRIPTSTACK;
/**
* Init the stack structure.
*
- * @returns nothing.
* @param pStack The stack to initialize.
* @param cbStackEntry The size of one stack entry.
*/
@@ -71,7 +70,6 @@ DECLINLINE(void) vdScriptStackInit(PVDSCRIPTSTACK pStack, size_t cbStackEntry)
/**
* Destroys the given stack freeing all memory.
*
- * @returns nothing.
* @param pStack The stack to destroy.
*/
DECLINLINE(void) vdScriptStackDestroy(PVDSCRIPTSTACK pStack)
@@ -134,7 +132,6 @@ DECLINLINE(void *)vdScriptStackGetUsed(PVDSCRIPTSTACK pStack)
/**
* Increases the used element count for the given stack.
*
- * @returns nothing.
* @param pStack The stack.
*/
DECLINLINE(void) vdScriptStackPush(PVDSCRIPTSTACK pStack)
@@ -145,7 +142,6 @@ DECLINLINE(void) vdScriptStackPush(PVDSCRIPTSTACK pStack)
/**
* Decreases the used element count for the given stack.
*
- * @returns nothing.
* @param pStack The stack.
*/
DECLINLINE(void) vdScriptStackPop(PVDSCRIPTSTACK pStack)
diff --git a/src/VBox/Storage/testcase/tstVDIo.cpp b/src/VBox/Storage/testcase/tstVDIo.cpp
index 87f219d9e27..4a8181b4280 100644
--- a/src/VBox/Storage/testcase/tstVDIo.cpp
+++ b/src/VBox/Storage/testcase/tstVDIo.cpp
@@ -2777,7 +2777,6 @@ static int tstVDIoPatternGetBuffer(PVDPATTERN pPattern, void **ppv, size_t cb)
/**
* Executes the given script.
*
- * @returns nothing.
* @param pszName The script name.
* @param pszScript The script to execute.
*/
@@ -2902,8 +2901,6 @@ static void tstVDIoScriptExec(const char *pszName, const char *pszScript)
/**
* Executes the given I/O script using the new scripting engine.
*
- * @returns nothing.
- *
* @param pcszFilename The script to execute.
*/
static void tstVDIoScriptRun(const char *pcszFilename)
@@ -2929,8 +2926,6 @@ static void tstVDIoScriptRun(const char *pcszFilename)
/**
* Run builtin tests.
- *
- * @returns nothing.
*/
static void tstVDIoRunBuiltinTests(void)
{