Changeset 103149 in vbox

Timestamp:

Jan 31, 2024 3:41:31 PM (12 months ago)

Author:

vboxsync

Message:

Additions: Some warning fixes about externally visible functions which should be static, bugref:3409

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControlSession.cpp (modified) (2 diffs)
• VBoxServiceStats.cpp (modified) (1 diff)
• VBoxServiceTimeSync.cpp (modified) (1 diff)
• VBoxServiceVMInfo.cpp (modified) (4 diffs)
• VBoxServiceVMInfo.h (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1729 +1729 @@
  * @param   pvUser              Pointer of type PVGSVCMOUNTPOINTENUMCTX.
  */
-DECLCALLBACK(int) vgsvcGstCtrlSessionHandleMountPointsEnumCallback(const char *pszMountpoint, void *pvUser)
+static DECLCALLBACK(int) vgsvcGstCtrlSessionHandleMountPointsEnumCallback(const char *pszMountpoint, void *pvUser)
 {
     PVGSVCMOUNTPOINTENUMCTX pCtx = (PVGSVCMOUNTPOINTENUMCTX)pvUser;
@@ -3732 +3732 @@
  * @param   fFlags                  Closing flags.
  */
-int VGSvcGstCtrlSessionThreadWait(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t uTimeoutMS, uint32_t fFlags)
+static int VGSvcGstCtrlSessionThreadWait(PVBOXSERVICECTRLSESSIONTHREAD pThread, uint32_t uTimeoutMS, uint32_t fFlags)
 {
     RT_NOREF(fFlags);

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp

@@ -633 +633 @@
  * @interface_method_impl{VBOXSERVICE,pfnWorker}
  */
-DECLCALLBACK(int) vgsvcVMStatsWorker(bool volatile *pfShutdown)
+static DECLCALLBACK(int) vgsvcVMStatsWorker(bool volatile *pfShutdown)
 {
     int rc = VINF_SUCCESS;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp

@@ -538 +538 @@
  * @interface_method_impl{VBOXSERVICE,pfnWorker}
  */
-DECLCALLBACK(int) vgsvcTimeSyncWorker(bool volatile *pfShutdown)
+static DECLCALLBACK(int) vgsvcTimeSyncWorker(bool volatile *pfShutdown)
 {
     RTTIME Time;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

@@ -112 +112 @@
 #include "VBoxServiceUtils.h"
 #include "VBoxServicePropCache.h"
+#include "VBoxServiceVMInfo.h"
 
 
@@ -155 +156 @@
 /** User idle threshold (in ms). This specifies the minimum time a user is considered
  *  as being idle and then will be reported to the host. Default is 5s. */
-uint32_t                        g_uVMInfoUserIdleThresholdMS = 5 * 1000;
+DECL_HIDDEN_DATA(uint32_t)      g_uVMInfoUserIdleThresholdMS = 5 * 1000;
 
 
@@ -429 +430 @@
  *                                  the property.
  */
-int VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                     const char *pszKey, const char *pszValueFormat, ...)
+DECLHIDDEN(int) VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                                 const char *pszKey, const char *pszValueFormat, ...)
 {
     AssertPtrReturn(pCache, VERR_INVALID_POINTER);
@@ -494 +495 @@
  * @param   va                      Format arguments.
  */
-int VGSvcUserUpdateV(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                     const char *pszKey, const char *pszFormat, va_list va)
+DECLHIDDEN(int) VGSvcUserUpdateV(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                                 const char *pszKey, const char *pszFormat, va_list va)
 {
     char *psz = NULL;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.h

@@ -33 +33 @@
 
 
-extern int VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                            const char *pszKey, const char *pszValueFormat, ...);
-extern int VGSvcUserUpdateV(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
-                            const char *pszKey, const char *pszFormat, va_list va);
+DECLHIDDEN(int) VGSvcUserUpdateF(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                                 const char *pszKey, const char *pszValueFormat, ...);
+DECLHIDDEN(int) VGSvcUserUpdateV(PVBOXSERVICEVEPROPCACHE pCache, const char *pszUser, const char *pszDomain,
+                                 const char *pszKey, const char *pszFormat, va_list va);
 
-extern uint32_t g_uVMInfoUserIdleThresholdMS;
+extern DECL_HIDDEN_DATA(uint32_t) g_uVMInfoUserIdleThresholdMS;
 
 #endif /* !GA_INCLUDED_SRC_common_VBoxService_VBoxServiceVMInfo_h */