Index: trunk/include/iprt/asn1-generator-pass.h
===================================================================
--- trunk/include/iprt/asn1-generator-pass.h	(revision 56980)
+++ trunk/include/iprt/asn1-generator-pass.h	(revision 57004)
@@ -932,6 +932,5 @@
             case RT_CONCAT(a_enmType,_NOT_PRESENT): \
                 rc = RTErrInfoSetF(pErrInfo, VERR_GENERAL_FAILURE, \
-                                   "%s: Invalid " #a_enmMembNm " value: " #a_enmType "_NOT_PRESENT", \
-                                   pszErrorTag, pThis->a_enmMembNm); \
+                                   "%s: Invalid " #a_enmMembNm " value: " #a_enmType "_NOT_PRESENT", pszErrorTag); \
                 break; \
         }
Index: trunk/include/iprt/asn1.h
===================================================================
--- trunk/include/iprt/asn1.h	(revision 56980)
+++ trunk/include/iprt/asn1.h	(revision 57004)
@@ -1596,5 +1596,5 @@
  * @param   ...                 Format arguments.
  */
-RTDECL(int) RTAsn1CursorSetInfo(PRTASN1CURSOR pCursor, int rc, const char *pszMsg, ...);
+RTDECL(int) RTAsn1CursorSetInfo(PRTASN1CURSOR pCursor, int rc, const char *pszMsg, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -1607,5 +1607,5 @@
  * @param   va                  Format arguments.
  */
-RTDECL(int) RTAsn1CursorSetInfoV(PRTASN1CURSOR pCursor, int rc, const char *pszMsg, va_list va);
+RTDECL(int) RTAsn1CursorSetInfoV(PRTASN1CURSOR pCursor, int rc, const char *pszMsg, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
Index: trunk/include/iprt/cdefs.h
===================================================================
--- trunk/include/iprt/cdefs.h	(revision 56980)
+++ trunk/include/iprt/cdefs.h	(revision 57004)
@@ -925,4 +925,16 @@
 #else
 # define RT_IPRT_FORMAT_ATTR(a_iFmt, a_iArgs)
+#endif
+
+/** @def RT_IPRT_FORMAT_ATTR_MAYBE_NULL
+ * Identifies a function taking an IPRT format string, NULL is allowed.
+ * @param   a_iFmt  The index (1-based) of the format string argument.
+ * @param   a_iArgs The index (1-based) of the first format argument, use 0 for
+ *                  va_list.
+ */
+#if defined(__GNUC__) && defined(WITH_IPRT_FORMAT_ATTRIBUTE)
+# define RT_IPRT_FORMAT_ATTR_MAYBE_NULL(a_iFmt, a_iArgs)   __attribute__((__iprt_format_maybe_null__(a_iFmt, a_iArgs)))
+#else
+# define RT_IPRT_FORMAT_ATTR_MAYBE_NULL(a_iFmt, a_iArgs)
 #endif
 
Index: trunk/include/iprt/condvar.h
===================================================================
--- trunk/include/iprt/condvar.h	(revision 56980)
+++ trunk/include/iprt/condvar.h	(revision 57004)
@@ -72,5 +72,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int)  RTConvVarCreateEx(PRTCONDVAR phCondVar, uint32_t fFlags, RTLOCKVALCLASS hClass, const char *pszNameFmt, ...);
+RTDECL(int)  RTConvVarCreateEx(PRTCONDVAR phCondVar, uint32_t fFlags, RTLOCKVALCLASS hClass,
+                               const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(4, 5);
 
 /** @name RTConvVarCreateEx flags
Index: trunk/include/iprt/critsect.h
===================================================================
--- trunk/include/iprt/critsect.h	(revision 56980)
+++ trunk/include/iprt/critsect.h	(revision 57004)
@@ -136,6 +136,6 @@
  * @param   ...             Format string arguments.
  */
-RTDECL(int) RTCritSectInitEx(PRTCRITSECT pCritSect, uint32_t fFlags,
-                             RTLOCKVALCLASS hClass, uint32_t uSubClass, const char *pszNameFmt, ...);
+RTDECL(int) RTCritSectInitEx(PRTCRITSECT pCritSect, uint32_t fFlags, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                             const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(5, 6);
 
 /**
@@ -484,6 +484,6 @@
  * @param   ...             Format string arguments.
  */
-RTDECL(int) RTCritSectRwInitEx(PRTCRITSECTRW pThis, uint32_t fFlags,
-                               RTLOCKVALCLASS hClass, uint32_t uSubClass, const char *pszNameFmt, ...);
+RTDECL(int) RTCritSectRwInitEx(PRTCRITSECTRW pThis, uint32_t fFlags, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                               const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(5, 6);
 
 /**
Index: trunk/include/iprt/dbg.h
===================================================================
--- trunk/include/iprt/dbg.h	(revision 56980)
+++ trunk/include/iprt/dbg.h	(revision 57004)
@@ -519,5 +519,6 @@
  * @param   va              Format arguments.
  */
-RTDECL(int) RTDbgAsCreateV(PRTDBGAS phDbgAs, RTUINTPTR FirstAddr, RTUINTPTR LastAddr, const char *pszNameFmt, va_list va);
+RTDECL(int) RTDbgAsCreateV(PRTDBGAS phDbgAs, RTUINTPTR FirstAddr, RTUINTPTR LastAddr,
+                           const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR(4, 0);
 
 /**
@@ -532,5 +533,6 @@
  * @param   ...             Format arguments.
  */
-RTDECL(int) RTDbgAsCreateF(PRTDBGAS phDbgAs, RTUINTPTR FirstAddr, RTUINTPTR LastAddr, const char *pszNameFmt, ...);
+RTDECL(int) RTDbgAsCreateF(PRTDBGAS phDbgAs, RTUINTPTR FirstAddr, RTUINTPTR LastAddr,
+                           const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(4, 5);
 
 /**
Index: trunk/include/iprt/err.h
===================================================================
--- trunk/include/iprt/err.h	(revision 56980)
+++ trunk/include/iprt/err.h	(revision 57004)
@@ -506,5 +506,5 @@
  * @param   ...                 The format arguments.
  */
-RTDECL(int)         RTErrInfoSetF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...);
+RTDECL(int)         RTErrInfoSetF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -518,5 +518,5 @@
  * @param   va                  The format arguments.
  */
-RTDECL(int)         RTErrInfoSetV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va);
+RTDECL(int)         RTErrInfoSetV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -541,5 +541,5 @@
  * @param   ...                 The format arguments.
  */
-RTDECL(int)         RTErrInfoAddF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...);
+RTDECL(int)         RTErrInfoAddF(PRTERRINFO pErrInfo, int rc, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -553,5 +553,5 @@
  * @param   va                  The format arguments.
  */
-RTDECL(int)         RTErrInfoAddV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va);
+RTDECL(int)         RTErrInfoAddV(PRTERRINFO pErrInfo, int rc, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
Index: trunk/include/iprt/file.h
===================================================================
--- trunk/include/iprt/file.h	(revision 56980)
+++ trunk/include/iprt/file.h	(revision 57004)
@@ -271,5 +271,5 @@
  * @param   ...             Arguments to the format string.
  */
-RTDECL(int)  RTFileOpenF(PRTFILE pFile, uint64_t fOpen, const char *pszFilenameFmt, ...);
+RTDECL(int)  RTFileOpenF(PRTFILE pFile, uint64_t fOpen, const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -284,5 +284,5 @@
  * @param   va              Arguments to the format string.
  */
-RTDECL(int)  RTFileOpenV(PRTFILE pFile, uint64_t fOpen, const char *pszFilenameFmt, va_list va);
+RTDECL(int)  RTFileOpenV(PRTFILE pFile, uint64_t fOpen, const char *pszFilenameFmt, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
Index: trunk/include/iprt/heap.h
===================================================================
--- trunk/include/iprt/heap.h	(revision 56980)
+++ trunk/include/iprt/heap.h	(revision 57004)
@@ -181,5 +181,5 @@
  * @param   ...         Format arguments.
  */
-typedef DECLCALLBACK(void) FNRTHEAPSIMPLEPRINTF(const char *pszFormat, ...);
+typedef DECLCALLBACK(void) FNRTHEAPSIMPLEPRINTF(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 /** Pointer to a FNRTHEAPSIMPLEPRINTF function. */
 typedef FNRTHEAPSIMPLEPRINTF *PFNRTHEAPSIMPLEPRINTF;
@@ -336,5 +336,5 @@
  * @param   ...         Format arguments.
  */
-typedef DECLCALLBACK(void) FNRTHEAPOFFSETPRINTF(const char *pszFormat, ...);
+typedef DECLCALLBACK(void) FNRTHEAPOFFSETPRINTF(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 /** Pointer to a FNRTHEAPOFFSETPRINTF function. */
 typedef FNRTHEAPOFFSETPRINTF *PFNRTHEAPOFFSETPRINTF;
Index: trunk/include/iprt/linux/sysfs.h
===================================================================
--- trunk/include/iprt/linux/sysfs.h	(revision 56980)
+++ trunk/include/iprt/linux/sysfs.h	(revision 57004)
@@ -48,5 +48,5 @@
  * @param   va          The format args.
  */
-RTDECL(bool) RTLinuxSysFsExistsV(const char *pszFormat, va_list va);
+RTDECL(bool) RTLinuxSysFsExistsV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -57,5 +57,5 @@
  * @param   ...         The format args.
  */
-RTDECL(bool) RTLinuxSysFsExists(const char *pszFormat, ...);
+RTDECL(bool) RTLinuxSysFsExists(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -66,5 +66,5 @@
  * @param   va          The format args.
  */
-RTDECL(int) RTLinuxSysFsOpenV(const char *pszFormat, va_list va);
+RTDECL(int) RTLinuxSysFsOpenV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -75,5 +75,5 @@
  * @param   ...         The format args.
  */
-RTDECL(int) RTLinuxSysFsOpen(const char *pszFormat, ...);
+RTDECL(int) RTLinuxSysFsOpen(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -115,5 +115,5 @@
  * @param   va          Format args.
  */
-RTDECL(int64_t) RTLinuxSysFsReadIntFileV(unsigned uBase, const char *pszFormat, va_list va);
+RTDECL(int64_t) RTLinuxSysFsReadIntFileV(unsigned uBase, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -125,5 +125,5 @@
  * @param   ...         Format args.
  */
-RTDECL(int64_t) RTLinuxSysFsReadIntFile(unsigned uBase, const char *pszFormat, ...);
+RTDECL(int64_t) RTLinuxSysFsReadIntFile(unsigned uBase, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -134,5 +134,5 @@
  * @param   va          Format args.
  */
-RTDECL(dev_t) RTLinuxSysFsReadDevNumFileV(const char *pszFormat, va_list va);
+RTDECL(dev_t) RTLinuxSysFsReadDevNumFileV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -143,5 +143,5 @@
  * @param   ...         Format args.
  */
-RTDECL(dev_t) RTLinuxSysFsReadDevNumFile(const char *pszFormat, ...);
+RTDECL(dev_t) RTLinuxSysFsReadDevNumFile(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -156,5 +156,5 @@
  * @param   va          Format args.
  */
-RTDECL(ssize_t) RTLinuxSysFsReadStrFileV(char *pszBuf, size_t cchBuf, const char *pszFormat, va_list va);
+RTDECL(ssize_t) RTLinuxSysFsReadStrFileV(char *pszBuf, size_t cchBuf, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -169,5 +169,5 @@
  * @param   ...         Format args.
  */
-RTDECL(ssize_t) RTLinuxSysFsReadStrFile(char *pszBuf, size_t cchBuf, const char *pszFormat, ...);
+RTDECL(ssize_t) RTLinuxSysFsReadStrFile(char *pszBuf, size_t cchBuf, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -187,5 +187,5 @@
  * @param   va           Format args.
  */
-RTDECL(ssize_t) RTLinuxSysFsGetLinkDestV(char *pszBuf, size_t cchBuf, const char *pszFormat, va_list va);
+RTDECL(ssize_t) RTLinuxSysFsGetLinkDestV(char *pszBuf, size_t cchBuf, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -205,5 +205,5 @@
  * @param   ...         Format args.
  */
-RTDECL(ssize_t) RTLinuxSysFsGetLinkDest(char *pszBuf, size_t cchBuf, const char *pszFormat, ...);
+RTDECL(ssize_t) RTLinuxSysFsGetLinkDest(char *pszBuf, size_t cchBuf, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -223,7 +223,6 @@
  * @param   va             Format args.
  */
-RTDECL(ssize_t) RTLinuxCheckDevicePathV(dev_t DevNum, RTFMODE fMode,
-                                        char *pszBuf, size_t cchBuf,
-                                        const char *pszPattern, va_list va);
+RTDECL(ssize_t) RTLinuxCheckDevicePathV(dev_t DevNum, RTFMODE fMode, char *pszBuf, size_t cchBuf,
+                                        const char *pszPattern, va_list va) RT_IPRT_FORMAT_ATTR(5, 0);
 
 /**
@@ -243,7 +242,6 @@
  * @param   ...             Format args.
  */
-RTDECL(ssize_t) RTLinuxCheckDevicePath(dev_t DevNum, RTFMODE fMode,
-                                       char *pszBuf, size_t cchBuf,
-                                       const char *pszPattern, ...);
+RTDECL(ssize_t) RTLinuxCheckDevicePath(dev_t DevNum, RTFMODE fMode, char *pszBuf, size_t cchBuf,
+                                       const char *pszPattern, ...) RT_IPRT_FORMAT_ATTR(5, 6);
 
 /** @} */
Index: trunk/include/iprt/lockvalidator.h
===================================================================
--- trunk/include/iprt/lockvalidator.h	(revision 56980)
+++ trunk/include/iprt/lockvalidator.h	(revision 57004)
@@ -265,6 +265,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(void) RTLockValidatorRecExclInit(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                        void *hLock, bool fEnabled, const char *pszNameFmt, ...);
+RTDECL(void) RTLockValidatorRecExclInit(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass, void *hLock,
+                                        bool fEnabled, const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(6, 7);
 /**
  * Initialize a lock validator record.
@@ -286,6 +286,6 @@
  * @param   va                  Format string arguments.
  */
-RTDECL(void) RTLockValidatorRecExclInitV(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                         void *hLock, bool fEnabled, const char *pszNameFmt, va_list va);
+RTDECL(void) RTLockValidatorRecExclInitV(PRTLOCKVALRECEXCL pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass, void *hLock,
+                                         bool fEnabled, const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(6, 0);
 /**
  * Uninitialize a lock validator record previously initialized by
@@ -317,6 +317,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int)  RTLockValidatorRecExclCreate(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                          void *hLock, bool fEnabled, const char *pszNameFmt, ...);
+RTDECL(int)  RTLockValidatorRecExclCreate(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass, void *hLock,
+                                          bool fEnabled, const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(6, 7);
 
 /**
@@ -341,6 +341,6 @@
  * @param   va                  Format string arguments.
  */
-RTDECL(int)  RTLockValidatorRecExclCreateV(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                           void *hLock, bool fEnabled, const char *pszNameFmt, va_list va);
+RTDECL(int)  RTLockValidatorRecExclCreateV(PRTLOCKVALRECEXCL *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass, void *hLock,
+                                           bool fEnabled, const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(6, 0);
 
 /**
@@ -565,5 +565,6 @@
  */
 RTDECL(void) RTLockValidatorRecSharedInit(PRTLOCKVALRECSHRD pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                          void *hLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, ...);
+                                          void *hLock, bool fSignaller, bool fEnabled,
+                                          const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(7, 8);
 
 /**
@@ -590,5 +591,6 @@
  */
 RTDECL(void) RTLockValidatorRecSharedInitV(PRTLOCKVALRECSHRD pRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                           void *hLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, va_list va);
+                                           void *hLock, bool fSignaller, bool fEnabled,
+                                           const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(7, 0);
 
 /**
@@ -625,5 +627,6 @@
  */
 RTDECL(int) RTLockValidatorRecSharedCreate(PRTLOCKVALRECSHRD *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                           void *pvLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, ...);
+                                           void *pvLock, bool fSignaller, bool fEnabled,
+                                           const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(7, 8);
 
 /**
@@ -652,5 +655,6 @@
  */
 RTDECL(int) RTLockValidatorRecSharedCreateV(PRTLOCKVALRECSHRD *ppRec, RTLOCKVALCLASS hClass, uint32_t uSubClass,
-                                            void *pvLock, bool fSignaller, bool fEnabled, const char *pszNameFmt, va_list va);
+                                            void *pvLock, bool fSignaller, bool fEnabled,
+                                            const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(7, 0);
 
 /**
@@ -945,5 +949,5 @@
                                          bool fAutodidact, bool fRecursionOk, bool fStrictReleaseOrder,
                                          RTMSINTERVAL cMsMinDeadlock, RTMSINTERVAL cMsMinOrder,
-                                         const char *pszNameFmt, ...);
+                                         const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(8, 9);
 
 /**
@@ -974,5 +978,5 @@
                                           bool fAutodidact, bool fRecursionOk, bool fStrictReleaseOrder,
                                           RTMSINTERVAL cMsMinDeadlock, RTMSINTERVAL cMsMinOrder,
-                                          const char *pszNameFmt, va_list va);
+                                          const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(8, 0);
 
 /**
@@ -991,5 +995,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int) RTLockValidatorClassCreate(PRTLOCKVALCLASS phClass, bool fAutodidact, RT_SRC_POS_DECL, const char *pszNameFmt, ...);
+RTDECL(int) RTLockValidatorClassCreate(PRTLOCKVALCLASS phClass, bool fAutodidact, RT_SRC_POS_DECL,
+                                       const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(6, 7);
 
 /**
@@ -1009,5 +1014,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(RTLOCKVALCLASS) RTLockValidatorClassCreateUnique(RT_SRC_POS_DECL, const char *pszNameFmt, ...);
+RTDECL(RTLOCKVALCLASS) RTLockValidatorClassCreateUnique(RT_SRC_POS_DECL,
+                                                        const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(4, 5);
 
 /**
@@ -1030,5 +1036,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(RTLOCKVALCLASS) RTLockValidatorClassForSrcPos(RT_SRC_POS_DECL, const char *pszNameFmt, ...);
+RTDECL(RTLOCKVALCLASS) RTLockValidatorClassForSrcPos(RT_SRC_POS_DECL,
+                                                     const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(4, 5);
 
 /**
Index: trunk/include/iprt/log.h
===================================================================
--- trunk/include/iprt/log.h	(revision 56980)
+++ trunk/include/iprt/log.h	(revision 57004)
@@ -1956,5 +1956,5 @@
 RTDECL(int) RTLogCreate(PRTLOGGER *ppLogger, uint32_t fFlags, const char *pszGroupSettings,
                         const char *pszEnvVarBase, unsigned cGroups, const char * const * papszGroups,
-                        uint32_t fDestFlags, const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR(8, 9);
+                        uint32_t fDestFlags, const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(8, 9);
 
 /**
@@ -1992,6 +1992,6 @@
                           const char *pszEnvVarBase, unsigned cGroups, const char * const * papszGroups,
                           uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
-                          uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot,
-                          char *pszErrorMsg, size_t cchErrorMsg, const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR(14, 15);
+                          uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, char *pszErrorMsg, size_t cchErrorMsg,
+                          const char *pszFilenameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(14, 15);
 
 /**
@@ -2031,7 +2031,6 @@
                            const char *pszEnvVarBase, unsigned cGroups, const char * const * papszGroups,
                            uint32_t fDestFlags, PFNRTLOGPHASE pfnPhase, uint32_t cHistory,
-                           uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot,
-                           char *pszErrorMsg, size_t cchErrorMsg,
-                           const char *pszFilenameFmt, va_list args) RT_IPRT_FORMAT_ATTR(14, 0);
+                           uint64_t cbHistoryFileMax, uint32_t cSecsHistoryTimeSlot, char *pszErrorMsg, size_t cchErrorMsg,
+                           const char *pszFilenameFmt, va_list args) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(14, 0);
 
 /**
Index: trunk/include/iprt/semaphore.h
===================================================================
--- trunk/include/iprt/semaphore.h	(revision 56980)
+++ trunk/include/iprt/semaphore.h	(revision 57004)
@@ -131,5 +131,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem, uint32_t fFlags, RTLOCKVALCLASS hClass, const char *pszNameFmt, ...);
+RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem, uint32_t fFlags, RTLOCKVALCLASS hClass,
+                                const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(4, 5);
 
 /** @name RTSemMutexCreateEx flags
@@ -301,5 +302,5 @@
  */
 RTDECL(int)  RTSemEventMultiCreateEx(PRTSEMEVENTMULTI phEventMultiSem, uint32_t fFlags, RTLOCKVALCLASS hClass,
-                                     const char *pszNameFmt, ...);
+                                     const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(4, 5);
 
 /** @name RTSemMutexCreateEx flags
@@ -481,6 +482,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int) RTSemMutexCreateEx(PRTSEMMUTEX phMutexSem, uint32_t fFlags,
-                               RTLOCKVALCLASS hClass, uint32_t uSubClass, const char *pszNameFmt, ...);
+RTDECL(int) RTSemMutexCreateEx(PRTSEMMUTEX phMutexSem, uint32_t fFlags, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                               const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(5, 6);
 
 /** @name RTSemMutexCreateEx flags
@@ -845,6 +846,6 @@
  * @param   ...                 Format string arguments.
  */
-RTDECL(int)   RTSemRWCreateEx(PRTSEMRW phRWSem, uint32_t fFlags,
-                              RTLOCKVALCLASS hClass, uint32_t uSubClass, const char *pszNameFmt, ...);
+RTDECL(int)   RTSemRWCreateEx(PRTSEMRW phRWSem, uint32_t fFlags, RTLOCKVALCLASS hClass, uint32_t uSubClass,
+                              const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(5, 6);
 
 /** @name RTSemRWCreateEx flags
Index: trunk/include/iprt/string.h
===================================================================
--- trunk/include/iprt/string.h	(revision 56980)
+++ trunk/include/iprt/string.h	(revision 57004)
@@ -1953,5 +1953,5 @@
  * @param   args        The format argument.
  */
-RTDECL(size_t) RTStrPrintfV(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args);
+RTDECL(size_t) RTStrPrintfV(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -2040,6 +2040,5 @@
  * @param   ...         The format argument.
  */
-DECLINLINE(int) RT_IPRT_FORMAT_ATTR(2, 3)
-RTStrAPrintf(char **ppszBuffer, const char *pszFormat, ...)
+DECLINLINE(int) RT_IPRT_FORMAT_ATTR(2, 3) RTStrAPrintf(char **ppszBuffer, const char *pszFormat, ...)
 {
     int     cbRet;
@@ -2064,6 +2063,5 @@
  * @param   ...         The format argument.
  */
-DECLINLINE(int) RT_IPRT_FORMAT_ATTR(3, 4)
-RTStrAPrintfTag(char **ppszBuffer, const char *pszTag, const char *pszFormat, ...)
+DECLINLINE(int) RT_IPRT_FORMAT_ATTR(3, 4) RTStrAPrintfTag(char **ppszBuffer, const char *pszTag, const char *pszFormat, ...)
 {
     int     cbRet;
@@ -2104,6 +2102,5 @@
  * @param   ...         The format argument.
  */
-DECLINLINE(char *) RT_IPRT_FORMAT_ATTR(1, 2)
-RTStrAPrintf2(const char *pszFormat, ...)
+DECLINLINE(char *) RT_IPRT_FORMAT_ATTR(1, 2) RTStrAPrintf2(const char *pszFormat, ...)
 {
     char   *pszRet;
@@ -2124,6 +2121,5 @@
  * @param   ...         The format argument.
  */
-DECLINLINE(char *) RT_IPRT_FORMAT_ATTR(2, 3)
-RTStrAPrintf2Tag(const char *pszTag, const char *pszFormat, ...)
+DECLINLINE(char *) RT_IPRT_FORMAT_ATTR(2, 3) RTStrAPrintf2Tag(const char *pszTag, const char *pszFormat, ...)
 {
     char   *pszRet;
Index: trunk/include/iprt/test.h
===================================================================
--- trunk/include/iprt/test.h	(revision 56980)
+++ trunk/include/iprt/test.h	(revision 57004)
@@ -262,5 +262,5 @@
  * @param   va          Arguments.
  */
-RTR3DECL(int) RTTestPrintfNlV(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestPrintfNlV(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -274,5 +274,5 @@
  * @param   ...         Arguments.
  */
-RTR3DECL(int) RTTestPrintfNl(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, ...);
+RTR3DECL(int) RTTestPrintfNl(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -286,5 +286,5 @@
  * @param   va          Arguments.
  */
-RTR3DECL(int) RTTestPrintfV(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestPrintfV(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -298,5 +298,5 @@
  * @param   ...         Arguments.
  */
-RTR3DECL(int) RTTestPrintf(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, ...);
+RTR3DECL(int) RTTestPrintf(RTTEST hTest, RTTESTLVL enmLevel, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -327,5 +327,5 @@
  * @param   va              Arguments for the reason format string.
  */
-RTR3DECL(RTEXITCODE) RTTestSkipAndDestroyV(RTTEST hTest, const char *pszReasonFmt, va_list va);
+RTR3DECL(RTEXITCODE) RTTestSkipAndDestroyV(RTTEST hTest, const char *pszReasonFmt, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -338,5 +338,5 @@
  * @param   ...             Arguments for the reason format string.
  */
-RTR3DECL(RTEXITCODE) RTTestSkipAndDestroy(RTTEST hTest, const char *pszReasonFmt, ...);
+RTR3DECL(RTEXITCODE) RTTestSkipAndDestroy(RTTEST hTest, const char *pszReasonFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -364,5 +364,5 @@
  * @param   ...             Arguments.
  */
-RTR3DECL(int) RTTestSubF(RTTEST hTest, const char *pszSubTestFmt, ...);
+RTR3DECL(int) RTTestSubF(RTTEST hTest, const char *pszSubTestFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -377,5 +377,5 @@
  * @param   va              Arguments.
  */
-RTR3DECL(int) RTTestSubV(RTTEST hTest, const char *pszSubTestFmt, va_list va);
+RTR3DECL(int) RTTestSubV(RTTEST hTest, const char *pszSubTestFmt, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -400,5 +400,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestPassedV(RTTEST hTest, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestPassedV(RTTEST hTest, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -414,5 +414,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestPassed(RTTEST hTest, const char *pszFormat, ...);
+RTR3DECL(int) RTTestPassed(RTTEST hTest, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -426,5 +426,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestSkipped(RTTEST hTest, const char *pszFormat, ...);
+RTR3DECL(int) RTTestSkipped(RTTEST hTest, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(2, 3);
 
 /**
@@ -438,5 +438,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestSkippedV(RTTEST hTest, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestSkippedV(RTTEST hTest, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR_MAYBE_NULL(2, 0);
 
 
@@ -527,5 +527,6 @@
  * @param   ...         String arguments.
  */
-RTR3DECL(int) RTTestValueF(RTTEST hTest, uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, ...);
+RTR3DECL(int) RTTestValueF(RTTEST hTest, uint64_t u64Value, RTTESTUNIT enmUnit,
+                           const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(4, 5);
 
 /**
@@ -541,5 +542,6 @@
  * @param   va_list     String arguments.
  */
-RTR3DECL(int) RTTestValueV(RTTEST hTest, uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, va_list va);
+RTR3DECL(int) RTTestValueV(RTTEST hTest, uint64_t u64Value, RTTESTUNIT enmUnit,
+                           const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR(4, 0);
 
 /**
@@ -579,5 +581,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestFailedV(RTTEST hTest, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestFailedV(RTTEST hTest, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -590,5 +592,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestFailed(RTTEST hTest, const char *pszFormat, ...);
+RTR3DECL(int) RTTestFailed(RTTEST hTest, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -601,5 +603,5 @@
  * @param   va          Arguments.
  */
-RTR3DECL(int) RTTestFailureDetailsV(RTTEST hTest, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestFailureDetailsV(RTTEST hTest, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -612,5 +614,5 @@
  * @param   ...         Arguments.
  */
-RTR3DECL(int) RTTestFailureDetails(RTTEST hTest, const char *pszFormat, ...);
+RTR3DECL(int) RTTestFailureDetails(RTTEST hTest, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 
@@ -878,5 +880,5 @@
  * @param   va          Arguments.
  */
-RTR3DECL(int) RTTestIPrintfV(RTTESTLVL enmLevel, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestIPrintfV(RTTESTLVL enmLevel, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -888,5 +890,5 @@
  * @param   ...         Arguments.
  */
-RTR3DECL(int) RTTestIPrintf(RTTESTLVL enmLevel, const char *pszFormat, ...);
+RTR3DECL(int) RTTestIPrintf(RTTESTLVL enmLevel, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -910,5 +912,5 @@
  * @param   ...             Arguments.
  */
-RTR3DECL(int) RTTestISubF(const char *pszSubTestFmt, ...);
+RTR3DECL(int) RTTestISubF(const char *pszSubTestFmt, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -921,5 +923,5 @@
  * @param   va              Arguments.
  */
-RTR3DECL(int) RTTestISubV(const char *pszSubTestFmt, va_list va);
+RTR3DECL(int) RTTestISubV(const char *pszSubTestFmt, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -940,5 +942,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestIPassedV(const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestIPassedV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -952,5 +954,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestIPassed(const char *pszFormat, ...);
+RTR3DECL(int) RTTestIPassed(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -979,5 +981,5 @@
  * @param   ...         String arguments.
  */
-RTR3DECL(int) RTTestIValueF(uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, ...);
+RTR3DECL(int) RTTestIValueF(uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(3, 4);
 
 /**
@@ -991,5 +993,5 @@
  * @param   va_list     String arguments.
  */
-RTR3DECL(int) RTTestIValueV(uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, va_list va);
+RTR3DECL(int) RTTestIValueV(uint64_t u64Value, RTTESTUNIT enmUnit, const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
 
 /**
@@ -1014,5 +1016,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestIFailedV(const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestIFailedV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -1023,5 +1025,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestIFailed(const char *pszFormat, ...);
+RTR3DECL(int) RTTestIFailed(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 /**
@@ -1037,5 +1039,5 @@
  * @param   va          The arguments.
  */
-RTR3DECL(int) RTTestIFailedRcV(int rcRet, const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestIFailedRcV(int rcRet, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 
 /**
@@ -1051,5 +1053,5 @@
  * @param   ...         The arguments.
  */
-RTR3DECL(int) RTTestIFailedRc(int rcRet, const char *pszFormat, ...);
+RTR3DECL(int) RTTestIFailedRc(int rcRet, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
 
 /**
@@ -1060,5 +1062,5 @@
  * @param   va          Arguments.
  */
-RTR3DECL(int) RTTestIFailureDetailsV(const char *pszFormat, va_list va);
+RTR3DECL(int) RTTestIFailureDetailsV(const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(1, 0);
 
 /**
@@ -1069,5 +1071,5 @@
  * @param   ...         Arguments.
  */
-RTR3DECL(int) RTTestIFailureDetails(const char *pszFormat, ...);
+RTR3DECL(int) RTTestIFailureDetails(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
 
 
Index: trunk/include/iprt/thread.h
===================================================================
--- trunk/include/iprt/thread.h	(revision 56980)
+++ trunk/include/iprt/thread.h	(revision 57004)
@@ -299,5 +299,5 @@
  */
 RTDECL(int) RTThreadCreateV(PRTTHREAD pThread, PFNRTTHREAD pfnThread, void *pvUser, size_t cbStack,
-                            RTTHREADTYPE enmType, uint32_t fFlags, const char *pszNameFmt, va_list va);
+                            RTTHREADTYPE enmType, uint32_t fFlags, const char *pszNameFmt, va_list va) RT_IPRT_FORMAT_ATTR(7, 0);
 
 /**
@@ -317,5 +317,5 @@
  */
 RTDECL(int) RTThreadCreateF(PRTTHREAD pThread, PFNRTTHREAD pfnThread, void *pvUser, size_t cbStack,
-                            RTTHREADTYPE enmType, uint32_t fFlags, const char *pszNameFmt, ...);
+                            RTTHREADTYPE enmType, uint32_t fFlags, const char *pszNameFmt, ...) RT_IPRT_FORMAT_ATTR(7, 8);
 
 /**
Index: trunk/include/iprt/trace.h
===================================================================
--- trunk/include/iprt/trace.h	(revision 56980)
+++ trunk/include/iprt/trace.h	(revision 57004)
@@ -176,6 +176,6 @@
 
 RTDECL(int)         RTTraceBufAddMsg(      RTTRACEBUF hTraceBuf, const char *pszMsg);
-RTDECL(int)         RTTraceBufAddMsgF(     RTTRACEBUF hTraceBuf, const char *pszMsgFmt, ...);
-RTDECL(int)         RTTraceBufAddMsgV(     RTTRACEBUF hTraceBuf, const char *pszMsgFmt, va_list va);
+RTDECL(int)         RTTraceBufAddMsgF(     RTTRACEBUF hTraceBuf, const char *pszMsgFmt, ...) RT_IPRT_FORMAT_ATTR(2, 3);
+RTDECL(int)         RTTraceBufAddMsgV(     RTTRACEBUF hTraceBuf, const char *pszMsgFmt, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 RTDECL(int)         RTTraceBufAddMsgEx(    RTTRACEBUF hTraceBuf, const char *pszMsg, size_t cbMaxMsg);
 
@@ -183,6 +183,6 @@
 RTDECL(int)         RTTraceBufAddPosMsg(   RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsg);
 RTDECL(int)         RTTraceBufAddPosMsgEx( RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsg, size_t cbMaxMsg);
-RTDECL(int)         RTTraceBufAddPosMsgF(  RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsgFmt, ...);
-RTDECL(int)         RTTraceBufAddPosMsgV(  RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsgFmt, va_list va);
+RTDECL(int)         RTTraceBufAddPosMsgF(  RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsgFmt, ...) RT_IPRT_FORMAT_ATTR(5, 6);
+RTDECL(int)         RTTraceBufAddPosMsgV(  RTTRACEBUF hTraceBuf, RT_SRC_POS_DECL, const char *pszMsgFmt, va_list va) RT_IPRT_FORMAT_ATTR(5, 0);
 
 
Index: trunk/include/iprt/types.h
===================================================================
--- trunk/include/iprt/types.h	(revision 56980)
+++ trunk/include/iprt/types.h	(revision 57004)
@@ -71,5 +71,5 @@
 #  include <sys/types.h>
 #  ifndef offsetof
-#   error "offsetof is not defined..."
+#   error "offsetof is not defined!"
 #  endif
 
@@ -2199,5 +2199,5 @@
  * @param   va              Arguments for the format string.
  */
-typedef DECLCALLBACK(void) FNRTDUMPPRINTFV(void *pvUser, const char *pszFormat, va_list va);
+typedef DECLCALLBACK(void) FNRTDUMPPRINTFV(void *pvUser, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
 /** Pointer to a generic printf-like function for dumping. */
 typedef FNRTDUMPPRINTFV *PFNRTDUMPPRINTFV;
@@ -2416,5 +2416,5 @@
 typedef union RTPTRUNION
 {
-    /** Pointer into the void... */
+    /** Pointer into the void. */
     void                   *pv;
     /** As a signed integer. */
@@ -2455,5 +2455,5 @@
 typedef union RTCPTRUNION
 {
-    /** Pointer into the void... */
+    /** Pointer into the void. */
     void const             *pv;
     /** As a signed integer. */
@@ -2494,5 +2494,5 @@
 typedef union RTVPTRUNION
 {
-    /** Pointer into the void... */
+    /** Pointer into the void. */
     void volatile          *pv;
     /** As a signed integer. */
@@ -2533,5 +2533,5 @@
 typedef union RTCVPTRUNION
 {
-    /** Pointer into the void... */
+    /** Pointer into the void. */
     void const volatile            *pv;
     /** As a signed integer. */
Index: trunk/include/iprt/uri.h
===================================================================
--- trunk/include/iprt/uri.h	(revision 56980)
+++ trunk/include/iprt/uri.h	(revision 57004)
@@ -55,5 +55,6 @@
  * @param   pszFragment         The fragment part of the URI (optional).
  */
-RTR3DECL(char *) RTUriCreate(const char *pszScheme, const char *pszAuthority, const char *pszPath, const char *pszQuery, const char *pszFragment);
+RTR3DECL(char *) RTUriCreate(const char *pszScheme, const char *pszAuthority, const char *pszPath, const char *pszQuery,
+                             const char *pszFragment);
 
 /**
Index: trunk/include/iprt/vector.h
===================================================================
--- trunk/include/iprt/vector.h	(revision 56980)
+++ trunk/include/iprt/vector.h	(revision 57004)
@@ -1,5 +1,4 @@
 /** @file
- * IPRT - Vector
- * STL-inspired vector implementation in C
+ * IPRT - Vector - STL-inspired vector implementation in C.
  */
 
@@ -65,6 +64,7 @@
  *       (or passing them as anonymously) makes it easier to take care of this.
  */
+
 #ifndef ___iprt_vector_h
-# define ___iprt_vector_h
+#define ___iprt_vector_h
 
 /*******************************************************************************
@@ -373,3 +373,4 @@
                                          pfnDelete)
 
-#endif /* ___iprt_vector_h */
+#endif /* !___iprt_vector_h */
+
