VirtualBox

Ignore:
Timestamp:
May 10, 2011 11:23:44 AM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
71639
Message:

iprt/dvm: use static, changed prefix of internal functions.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/common/dvm/dvmgpt.cpp

    r36868 r37024  
    2525 */
    2626
     27
     28/*******************************************************************************
     29*   Header Files                                                               *
     30*******************************************************************************/
    2731#include <iprt/types.h>
    2832#include <iprt/assert.h>
    … …  
    3337#include "internal/dvm.h"
    3438
     39
     40/*******************************************************************************
     41*   Structures and Typedefs                                                    *
     42*******************************************************************************/
    3543/** The GPT signature. */
    3644#define RTDVM_GPT_SIGNATURE "EFI PART"
    … …  
    178186#define RTDVM_GPT_BYTE2LBA(lba, disk) ((lba) / (disk)->cbSector)
    179187
     188
     189/*******************************************************************************
     190*   Global Variables                                                           *
     191*******************************************************************************/
    180192/**
    181193 * Mapping of partition types to DVM volume types.
    … …  
    216228};
    217229
    218 DECLCALLBACK(int) dvmFmtGptProbe(PCRTDVMDISK pDisk, uint32_t *puScore)
     230static DECLCALLBACK(int) rtDvmFmtGptProbe(PCRTDVMDISK pDisk, uint32_t *puScore)
    219231{
    220232    int rc = VINF_SUCCESS;
    … …  
    223235    *puScore = RTDVM_MATCH_SCORE_UNSUPPORTED;
    224236
    225     if (dvmDiskGetSectors(pDisk) >= 2)
     237    if (rtDvmDiskGetSectors(pDisk) >= 2)
    226238    {
    227239        /* Read from the disk and check for the signature. */
    228         rc = dvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(1, pDisk), &Hdr, sizeof(GptHdr));
     240        rc = rtDvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(1, pDisk), &Hdr, sizeof(GptHdr));
    229241        if (   RT_SUCCESS(rc)
    230242            && !strncmp(&Hdr.abSignature[0], RTDVM_GPT_SIGNATURE, RT_ELEMENTS(Hdr.abSignature))
    … …  
    237249}
    238250
    239 DECLCALLBACK(int) dvmFmtGptOpen(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt)
     251static DECLCALLBACK(int) rtDvmFmtGptOpen(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt)
    240252{
    241253    int rc = VINF_SUCCESS;
    … …  
    249261
    250262        /* Read the complete GPT header and convert to host endianess. */
    251         rc = dvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(1, pDisk), &pThis->HdrRev1, sizeof(pThis->HdrRev1));
     263        rc = rtDvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(1, pDisk), &pThis->HdrRev1, sizeof(pThis->HdrRev1));
    252264        if (RT_SUCCESS(rc))
    253265        {
    … …  
    270282                if (VALID_PTR(pThis->paGptEntries))
    271283                {
    272                     rc = dvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(pThis->HdrRev1.u64LbaPartitionEntries, pDisk),
     284                    rc = rtDvmDiskRead(pDisk, RTDVM_GPT_LBA2BYTE(pThis->HdrRev1.u64LbaPartitionEntries, pDisk),
    273285                                     pThis->paGptEntries, pThis->HdrRev1.cPartitionEntries * pThis->HdrRev1.cbPartitionEntry);
    274286                    if (RT_SUCCESS(rc))
    … …  
    311323}
    312324
    313 DECLCALLBACK(int) dvmFmtGptInitialize(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt)
     325static DECLCALLBACK(int) rtDvmFmtGptInitialize(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt)
    314326{
    315327    return VERR_NOT_IMPLEMENTED;
    316328}
    317329
    318 DECLCALLBACK(void) dvmFmtGptClose(RTDVMFMT hVolMgrFmt)
     330static DECLCALLBACK(void) rtDvmFmtGptClose(RTDVMFMT hVolMgrFmt)
    319331{
    320332    PRTDVMFMTINTERNAL pThis = hVolMgrFmt;
    … …  
    328340}
    329341
    330 DECLCALLBACK(uint32_t) dvmFmtGptGetValidVolumes(RTDVMFMT hVolMgrFmt)
     342static DECLCALLBACK(uint32_t) rtDvmFmtGptGetValidVolumes(RTDVMFMT hVolMgrFmt)
    331343{
    332344    PRTDVMFMTINTERNAL pThis = hVolMgrFmt;
    … …  
    335347}
    336348
    337 DECLCALLBACK(uint32_t) dvmFmtGptGetMaxVolumes(RTDVMFMT hVolMgrFmt)
     349static DECLCALLBACK(uint32_t) rtDvmFmtGptGetMaxVolumes(RTDVMFMT hVolMgrFmt)
    338350{
    339351    PRTDVMFMTINTERNAL pThis = hVolMgrFmt;
    … …  
    351363 * @param   phVolFmt      Where to store the volume data on success.
    352364 */
    353 static int dvmFmtMbrVolumeCreate(PRTDVMFMTINTERNAL pThis, PGptEntry pGptEntry,
     365static int rtDvmFmtMbrVolumeCreate(PRTDVMFMTINTERNAL pThis, PGptEntry pGptEntry,
    354366                                 uint32_t idx, PRTDVMVOLUMEFMT phVolFmt)
    355367{
    … …  
    373385}
    374386
    375 DECLCALLBACK(int) dvmFmtGptQueryFirstVolume(RTDVMFMT hVolMgrFmt, PRTDVMVOLUMEFMT phVolFmt)
     387static DECLCALLBACK(int) rtDvmFmtGptQueryFirstVolume(RTDVMFMT hVolMgrFmt, PRTDVMVOLUMEFMT phVolFmt)
    376388{
    377389    int rc = VINF_SUCCESS;
    … …  
    387399            if (!RTUuidIsNull(&pGptEntry->UuidType))
    388400            {
    389                 rc = dvmFmtMbrVolumeCreate(pThis, pGptEntry, i, phVolFmt);
     401                rc = rtDvmFmtMbrVolumeCreate(pThis, pGptEntry, i, phVolFmt);
    390402                break;
    391403            }
    … …  
    399411}
    400412
    401 DECLCALLBACK(int) dvmFmtGptQueryNextVolume(RTDVMFMT hVolMgrFmt, RTDVMVOLUMEFMT hVolFmt, PRTDVMVOLUMEFMT phVolFmtNext)
     413static DECLCALLBACK(int) rtDvmFmtGptQueryNextVolume(RTDVMFMT hVolMgrFmt, RTDVMVOLUMEFMT hVolFmt, PRTDVMVOLUMEFMT phVolFmtNext)
    402414{
    403415    int rc = VERR_DVM_MAP_NO_VOLUME;
    … …  
    410422        if (!RTUuidIsNull(&pGptEntry->UuidType))
    411423        {
    412             rc = dvmFmtMbrVolumeCreate(pThis, pGptEntry, i, phVolFmtNext);
     424            rc = rtDvmFmtMbrVolumeCreate(pThis, pGptEntry, i, phVolFmtNext);
    413425            break;
    414426        }
    … …  
    419431}
    420432
    421 DECLCALLBACK(void) dvmFmtGptVolumeClose(RTDVMVOLUMEFMT hVolFmt)
     433static DECLCALLBACK(void) rtDvmFmtGptVolumeClose(RTDVMVOLUMEFMT hVolFmt)
    422434{
    423435    PRTDVMVOLUMEFMTINTERNAL pVol = hVolFmt;
    … …  
    431443}
    432444
    433 DECLCALLBACK(uint64_t) dvmFmtGptVolumeGetSize(RTDVMVOLUMEFMT hVolFmt)
     445static DECLCALLBACK(uint64_t) rtDvmFmtGptVolumeGetSize(RTDVMVOLUMEFMT hVolFmt)
    434446{
    435447    PRTDVMVOLUMEFMTINTERNAL pVol = hVolFmt;
    … …  
    438450}
    439451
    440 DECLCALLBACK(int) dvmFmtGptVolumeQueryName(RTDVMVOLUMEFMT hVolFmt, char **ppszVolName)
     452static DECLCALLBACK(int) rtDvmFmtGptVolumeQueryName(RTDVMVOLUMEFMT hVolFmt, char **ppszVolName)
    441453{
    442454    PRTDVMVOLUMEFMTINTERNAL pVol = hVolFmt;
    … …  
    450462}
    451463
    452 DECLCALLBACK(RTDVMVOLTYPE) dvmFmtGptVolumeGetType(RTDVMVOLUMEFMT hVolFmt)
     464static DECLCALLBACK(RTDVMVOLTYPE) rtDvmFmtGptVolumeGetType(RTDVMVOLUMEFMT hVolFmt)
    453465{
    454466    RTDVMVOLTYPE enmVolType = RTDVMVOLTYPE_UNKNOWN;
    … …  
    465477}
    466478
    467 DECLCALLBACK(uint64_t) dvmFmtGptVolumeGetFlags(RTDVMVOLUMEFMT hVolFmt)
     479static DECLCALLBACK(uint64_t) rtDvmFmtGptVolumeGetFlags(RTDVMVOLUMEFMT hVolFmt)
    468480{
    469481    NOREF(hVolFmt); /* No supported flags for now. */
    … …  
    471483}
    472484
    473 DECLCALLBACK(int) dvmFmtGptVolumeRead(RTDVMVOLUMEFMT hVolFmt, uint64_t off, void *pvBuf, size_t cbRead)
     485static DECLCALLBACK(int) rtDvmFmtGptVolumeRead(RTDVMVOLUMEFMT hVolFmt, uint64_t off, void *pvBuf, size_t cbRead)
    474486{
    475487    PRTDVMVOLUMEFMTINTERNAL pVol = hVolFmt;
    476488    AssertReturn(off + cbRead <= pVol->cbVolume, VERR_INVALID_PARAMETER);
    477489
    478     return dvmDiskRead(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
    479 }
    480 
    481 DECLCALLBACK(int) dvmFmtGptVolumeWrite(RTDVMVOLUMEFMT hVolFmt, uint64_t off, const void *pvBuf, size_t cbWrite)
     490    return rtDvmDiskRead(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbRead);
     491}
     492
     493static DECLCALLBACK(int) rtDvmFmtGptVolumeWrite(RTDVMVOLUMEFMT hVolFmt, uint64_t off, const void *pvBuf, size_t cbWrite)
    482494{
    483495    PRTDVMVOLUMEFMTINTERNAL pVol = hVolFmt;
    484496    AssertReturn(off + cbWrite <= pVol->cbVolume, VERR_INVALID_PARAMETER);
    485497
    486     return dvmDiskWrite(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbWrite);
    487 }
    488 
    489 RTDVMFMTOPS g_DvmFmtGpt =
     498    return rtDvmDiskWrite(pVol->pVolMgr->pDisk, pVol->offStart + off, pvBuf, cbWrite);
     499}
     500
     501RTDVMFMTOPS g_rtDvmFmtGpt =
    490502{
    491503    /* pcszFmt */
    492504    "GPT",
    493505    /* pfnProbe */
    494     dvmFmtGptProbe,
     506    rtDvmFmtGptProbe,
    495507    /* pfnOpen */
    496     dvmFmtGptOpen,
     508    rtDvmFmtGptOpen,
    497509    /* pfnInitialize */
    498     dvmFmtGptInitialize,
     510    rtDvmFmtGptInitialize,
    499511    /* pfnClose */
    500     dvmFmtGptClose,
     512    rtDvmFmtGptClose,
    501513    /* pfnGetValidVolumes */
    502     dvmFmtGptGetValidVolumes,
     514    rtDvmFmtGptGetValidVolumes,
    503515    /* pfnGetMaxVolumes */
    504     dvmFmtGptGetMaxVolumes,
     516    rtDvmFmtGptGetMaxVolumes,
    505517    /* pfnQueryFirstVolume */
    506     dvmFmtGptQueryFirstVolume,
     518    rtDvmFmtGptQueryFirstVolume,
    507519    /* pfnQueryNextVolume */
    508     dvmFmtGptQueryNextVolume,
     520    rtDvmFmtGptQueryNextVolume,
    509521    /* pfnVolumeClose */
    510     dvmFmtGptVolumeClose,
     522    rtDvmFmtGptVolumeClose,
    511523    /* pfnVolumeGetSize */
    512     dvmFmtGptVolumeGetSize,
     524    rtDvmFmtGptVolumeGetSize,
    513525    /* pfnVolumeQueryName */
    514     dvmFmtGptVolumeQueryName,
     526    rtDvmFmtGptVolumeQueryName,
    515527    /* pfnVolumeGetType */
    516     dvmFmtGptVolumeGetType,
     528    rtDvmFmtGptVolumeGetType,
    517529    /* pfnVolumeGetFlags */
    518     dvmFmtGptVolumeGetFlags,
     530    rtDvmFmtGptVolumeGetFlags,
    519531    /* pfnVolumeRead */
    520     dvmFmtGptVolumeRead,
     532    rtDvmFmtGptVolumeRead,
    521533    /* pfnVolumeWrite */
    522     dvmFmtGptVolumeWrite
     534    rtDvmFmtGptVolumeWrite
    523535};
    524536
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette