VirtualBox

Changeset 66415 in vbox for trunk


Ignore:
Timestamp:
Apr 4, 2017 1:17:22 PM (8 years ago)
Author:
vboxsync
Message:

IPRT: split %RKv formatting into separate function.

Location:
trunk/src/VBox
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile

    r54609 r66415  
    123123        RTSemEventMultiWaitNoResume-2-ex-generic.c \
    124124        RTTimerCreate-generic.c \
     125        rtStrFormatKernelAddress-generic.c \
    125126        timer-generic.c \
    126127        errvars-generic.c \
  • trunk/src/VBox/Additions/common/VBoxGuest/freebsd/files_vboxguest

    r57943 r66415  
    159159    ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp=>generic/RTSemEventMultiWaitNoResume-2-ex-generic.c \
    160160    ${PATH_ROOT}/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp=>generic/RTTimerCreate-generic.c \
     161    ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \
    161162    ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
    162163    ${PATH_ROOT}/src/VBox/Runtime/generic/timer-generic.cpp=>generic/timer-generic.c \
  • trunk/src/VBox/Additions/common/VBoxGuest/linux/Makefile

    r61081 r66415  
    5959        common/err/RTErrConvertToErrno.o \
    6060        common/log/log.o \
    61         common/log/logellipsis.o \
    62         common/log/logrel.o \
    63         common/log/logrelellipsis.o \
    64         common/log/logcom.o \
     61        common/log/logellipsis.o \
     62        common/log/logrel.o \
     63        common/log/logrelellipsis.o \
     64        common/log/logcom.o \
    6565        common/log/logformat.o \
    6666        common/misc/RTAssertMsg1Weak.o \
     
    8484        common/time/time.o \
    8585        generic/RTAssertShouldPanic-generic.o \
    86         generic/RTLogWriteStdErr-stub-generic.o \
    87         generic/RTLogWriteStdOut-stub-generic.o \
     86        generic/RTLogWriteStdErr-stub-generic.o \
     87        generic/RTLogWriteStdOut-stub-generic.o \
    8888        generic/RTMpGetCoreCount-generic.o \
    8989        generic/RTSemEventWait-2-ex-generic.o \
     
    9191        generic/RTSemEventMultiWait-2-ex-generic.o \
    9292        generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \
     93        generic/rtStrFormatKernelAddress-generic.o \
    9394        generic/errvars-generic.o \
    9495        generic/mppresent-generic.o \
  • trunk/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest

    r58347 r66415  
    148148    ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp=>generic/RTSemEventMultiWait-2-ex-generic.c \
    149149    ${PATH_ROOT}/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp=>generic/RTSemEventMultiWaitNoResume-2-ex-generic.c \
     150    ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \
    150151    ${PATH_ROOT}/src/VBox/Runtime/generic/errvars-generic.cpp=>generic/errvars-generic.c \
    151152    ${PATH_ROOT}/src/VBox/Runtime/generic/mppresent-generic.cpp=>generic/mppresent-generic.c \
  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r66072 r66415  
    362362        $(VBOX_PATH_RUNTIME_SRC)/generic/RTPathGetCurrentDrive-generic.cpp \
    363363        $(VBOX_PATH_RUNTIME_SRC)/generic/RTPathGetCurrentOnDrive-generic.cpp \
     364        $(VBOX_PATH_RUNTIME_SRC)/generic/rtStrFormatKernelAddress-generic.cpp \
    364365        $(VBOX_PATH_RUNTIME_SRC)/generic/memsafer-generic.cpp \
    365366        $(VBOX_PATH_RUNTIME_SRC)/generic/uuid-generic.cpp \
  • trunk/src/VBox/HostDrivers/Support/freebsd/Makefile

    r60603 r66415  
    142142        RTSemEventMultiWaitNoResume-2-ex-generic.c \
    143143        RTTimerCreate-generic.c \
     144        rtStrFormatKernelAddress-generic.c \
    144145        errvars-generic.c \
    145146        mppresent-generic.c \
  • trunk/src/VBox/HostDrivers/Support/freebsd/files_vboxdrv

    r60603 r66415  
    160160    ${PATH_ROOT}/src/VBox/Runtime/include/internal/process.h=>include/internal/process.h \
    161161    ${PATH_ROOT}/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \
     162    ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \
    162163    ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \
    163164    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
  • trunk/src/VBox/HostDrivers/Support/linux/Makefile

    r61411 r66415  
    149149        generic/RTSemEventMultiWaitNoResume-2-ex-generic.o \
    150150        generic/RTTimerCreate-generic.o \
     151        generic/rtStrFormatKernelAddress-generic.o \
    151152        generic/errvars-generic.o \
    152153        generic/mppresent-generic.o \
  • trunk/src/VBox/HostDrivers/Support/linux/files_vboxdrv

    r66022 r66415  
    153153    ${PATH_ROOT}/src/VBox/Runtime/include/internal/thread.h=>include/internal/thread.h \
    154154    ${PATH_ROOT}/src/VBox/Runtime/include/internal/time.h=>include/internal/time.h \
     155    ${PATH_ROOT}/src/VBox/Runtime/generic/rtStrFormatKernelAddress-generic.cpp=>generic/rtStrFormatKernelAddress-generic.c \
    155156    ${PATH_ROOT}/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp=>generic/RTAssertShouldPanic-generic.c \
    156157    ${PATH_ROOT}/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp=>generic/RTLogWriteStdErr-stub-generic.c \
  • trunk/src/VBox/Runtime/Makefile.kmk

    r66395 r66415  
    638638        generic/RTPathIsSame-generic.cpp \
    639639        generic/RTTimerLRCreate-generic.cpp \
     640        generic/rtStrFormatKernelAddress-generic.cpp \
    640641        generic/mempool-generic.cpp \
    641642        generic/semfastmutex-generic.cpp \
     
    21082109        generic/RTSemEventMultiWait-2-ex-generic.cpp \
    21092110        generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp \
     2111        generic/rtStrFormatKernelAddress-generic.cpp \
    21102112        generic/critsect-generic.cpp \
    21112113        generic/errvars-generic.cpp \
     
    26282630        gc/initterm-gc.cpp \
    26292631        generic/RTAssertShouldPanic-generic.cpp \
     2632        generic/rtStrFormatKernelAddress-generic.cpp \
    26302633        generic/errvars-generic.cpp \
    26312634        \
  • trunk/src/VBox/Runtime/common/string/strformatrt.cpp

    r66304 r66415  
    365365                    int32_t             i32;
    366366                    int64_t             i64;
     367                    RTR0INTPTR          uR0Ptr;
    367368                    RTFAR16             fp16;
    368369                    RTFAR32             fp32;
     
    478479                if (fFlags & RTSTR_F_OBFUSCATE_PTR)
    479480                {
    480 # if R0_ARCH_BITS == 64
    481                     static const char s_szObfuscated[] = "0xXXXXXXXXXXXXXXXX";
    482 # else
    483                     static const char s_szObfuscated[] = "0xXXXXXXXX";
    484 # endif
    485                     if (fFlags & RTSTR_F_SPECIAL)
    486                         return pfnOutput(pvArgOutput, s_szObfuscated, sizeof(s_szObfuscated) - 1);
    487                     return pfnOutput(pvArgOutput, &s_szObfuscated[2], sizeof(s_szObfuscated) - 1 - 2);
     481                    cch = rtStrFormatKernelAddress(szBuf, sizeof(szBuf), u.uR0Ptr, cchWidth, cchPrecision, fFlags);
     482                    return pfnOutput(pvArgOutput, szBuf, cch);
    488483                }
    489484#endif
  • trunk/src/VBox/Runtime/include/internal/string.h

    r62477 r66415  
    5353                                   int cchWidth, int cchPrecision, unsigned fFlags, char chArgSize);
    5454
     55/**
     56 * Format kernel address into @a pszBuf.
     57 *
     58 * @returns Number of bytes returned.
     59 * @param   pszBuf          The return buffer.
     60 * @param   cbBuf           The buffer size.
     61 * @param   uPtr            The ring-0 pointer value.
     62 * @param   cchWidth        The specified width, -1 if not given.
     63 * @param   cchPrecision    The specified precision.
     64 * @param   fFlags          Format flags, RTSTR_F_XXX.
     65 */
     66DECLHIDDEN(size_t) rtStrFormatKernelAddress(char *pszBuf, size_t cbBuf, RTR0INTPTR uPtr, signed int cchWidth,
     67                                            signed int cchPrecision, unsigned int fFlags);
     68
    5569#ifdef RT_WITH_ICONV_CACHE
    5670DECLHIDDEN(void) rtStrIconvCacheInit(struct RTTHREADINT *pThread);
Note: See TracChangeset for help on using the changeset viewer.

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