Changeset 103143 in vbox

Timestamp:

Jan 31, 2024 3:04:39 PM (8 months ago)

Author:

vboxsync

Message:

HostServices/SharedClipboard: Some warning fixes about externally visible functions which should be static, bugref:3409

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• darwin-pasteboard.cpp (modified) (7 diffs)
• darwin-pasteboard.h (modified) (1 diff)

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp

@@ -45 +45 @@
 #include <VBox/GuestHost/clipboard-helper.h>
 
+#include "darwin-pasteboard.h"
 
 /*********************************************************************************************************************************
@@ -65 +66 @@
  * @returns IPRT status code.
  */
-int initPasteboard(PasteboardRef *pPasteboardRef)
+DECLHIDDEN(int) initPasteboard(PasteboardRef *pPasteboardRef)
 {
     int rc = VINF_SUCCESS;
@@ -80 +81 @@
  * @param pPasteboardRef Reference to the global pasteboard.
  */
-void destroyPasteboard(PasteboardRef *pPasteboardRef)
+DECLHIDDEN(void) destroyPasteboard(PasteboardRef *pPasteboardRef)
 {
     CFRelease(*pPasteboardRef);
@@ -101 +102 @@
  * @returns VINF_SUCCESS.
  */
-int queryNewPasteboardFormats(PasteboardRef hPasteboard, uint64_t idOwnership, void *hStrOwnershipFlavor,
-                              uint32_t *pfFormats, bool *pfChanged)
+DECLHIDDEN(int) queryNewPasteboardFormats(PasteboardRef hPasteboard, uint64_t idOwnership, void *hStrOwnershipFlavor,
+                                          uint32_t *pfFormats, bool *pfChanged)
 {
     OSStatus orc;
@@ -218 +219 @@
  * @returns IPRT status code.
  */
-int readFromPasteboard(PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual)
+DECLHIDDEN(int) readFromPasteboard(PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual)
 {
     Log(("readFromPasteboard: fFormat = %02X\n", fFormat));
@@ -474 +475 @@
  *          flavor priority.
  */
-int takePasteboardOwnership(PasteboardRef hPasteboard, uint64_t idOwnership, const char *pszOwnershipFlavor,
-                            const char *pszOwnershipValue, void **phStrOwnershipFlavor)
+DECLHIDDEN(int) takePasteboardOwnership(PasteboardRef hPasteboard, uint64_t idOwnership, const char *pszOwnershipFlavor,
+                                        const char *pszOwnershipValue, void **phStrOwnershipFlavor)
 {
     /*
@@ -543 +544 @@
  * @returns IPRT status code.
  */
-int writeToPasteboard(PasteboardRef hPasteboard, uint64_t idOwnership, const void *pv, uint32_t cb, uint32_t fFormat)
+DECLHIDDEN(int) writeToPasteboard(PasteboardRef hPasteboard, uint64_t idOwnership, const void *pv, uint32_t cb, uint32_t fFormat)
 {
     int       rc;

trunk/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h

@@ -32 +32 @@
 #endif
 
+#include <iprt/cdefs.h>
+
 typedef struct OpaquePasteboardRef *PasteboardRef;
 
-int initPasteboard(PasteboardRef *pPasteboardRef);
-void destroyPasteboard(PasteboardRef *pPasteboardRef);
+DECLHIDDEN(int) initPasteboard(PasteboardRef *pPasteboardRef);
+DECLHIDDEN(void) destroyPasteboard(PasteboardRef *pPasteboardRef);
 
-int queryNewPasteboardFormats(PasteboardRef hPasteboard, uint64_t idOwnership, void *hStrOwnershipFlavor,
-                              uint32_t *pfFormats, bool *pfChanged);
-int readFromPasteboard(PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual);
-int takePasteboardOwnership(PasteboardRef pPasteboard, uint64_t idOwnership, const char *pszOwnershipFlavor,
-                            const char *pszOwnershipValue, void **phStrOwnershipFlavor);
-int writeToPasteboard(PasteboardRef hPasteboard, uint64_t idOwnership, void const *pv, uint32_t cb, uint32_t fFormat);
+DECLHIDDEN(int) queryNewPasteboardFormats(PasteboardRef hPasteboard, uint64_t idOwnership, void *hStrOwnershipFlavor,
+                                          uint32_t *pfFormats, bool *pfChanged);
+DECLHIDDEN(int) readFromPasteboard(PasteboardRef pPasteboard, uint32_t fFormat, void *pv, uint32_t cb, uint32_t *pcbActual);
+DECLHIDDEN(int) takePasteboardOwnership(PasteboardRef pPasteboard, uint64_t idOwnership, const char *pszOwnershipFlavor,
+                                        const char *pszOwnershipValue, void **phStrOwnershipFlavor);
+DECLHIDDEN(int) writeToPasteboard(PasteboardRef hPasteboard, uint64_t idOwnership, void const *pv, uint32_t cb, uint32_t fFormat);
 
 #endif /* !VBOX_INCLUDED_SRC_SharedClipboard_darwin_pasteboard_h */