Changeset 102345 in vbox for trunk/src/libs/xpcom18a4/ipc

Timestamp:

Nov 27, 2023 6:48:07 PM (14 months ago)

Author:

vboxsync

Message:

libs/xpcom: Replace remaining APIs from prprf.h with IPRT equivalents, bugref:10545

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd

Files:

• daemon/src/ipcdUnix.cpp (modified) (2 diffs)
• shared/src/ipcConfig.h (modified) (2 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -59 +59 @@
 #include <errno.h>
 
-#include "prprf.h"
-
 #include "ipcConfig.h"
 #include "ipcMessage.h"
@@ -205 +203 @@
     //
     char buf[32];
-    int nb = PR_snprintf(buf, sizeof(buf), "%u\n", (unsigned long) getpid());
-    write(ipcLockFD, buf, nb);
+    ssize_t nb = RTStrPrintf2(buf, sizeof(buf), "%u\n", (unsigned long) getpid());
+    if (nb <= 0)
+        return ELockFileOpen;
+    write(ipcLockFD, buf, (size_t)nb);
 
     return EOk;

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.h

@@ -39 +39 @@
 #define ipcProto_h__
 
-#if defined(XP_WIN)
-//
-// use WM_COPYDATA messages
-//
-#include "prprf.h"
-
-#define IPC_WINDOW_CLASS              "Mozilla:IPCWindowClass"
-#define IPC_WINDOW_NAME               "Mozilla:IPCWindow"
-#define IPC_CLIENT_WINDOW_CLASS       "Mozilla:IPCAppWindowClass"
-#define IPC_CLIENT_WINDOW_NAME_PREFIX "Mozilla:IPCAppWindow:"
-#define IPC_SYNC_EVENT_NAME           "Local\\MozillaIPCSyncEvent"
-#ifndef IPC_DAEMON_APP_NAME
-#define IPC_DAEMON_APP_NAME           "mozilla-ipcd.exe"
-#endif
-#define IPC_PATH_SEP_CHAR             '\\'
-#define IPC_MODULES_DIR               "ipc\\modules"
-
-#define IPC_CLIENT_WINDOW_NAME_MAXLEN (sizeof(IPC_CLIENT_WINDOW_NAME_PREFIX) + 20)
-
-// writes client name into buf.  buf must be at least
-// IPC_CLIENT_WINDOW_NAME_MAXLEN bytes in length.
-inline void IPC_GetClientWindowName(PRUint32 pid, char *buf)
-{
-    PR_snprintf(buf, IPC_CLIENT_WINDOW_NAME_MAXLEN, "%s%u",
-                IPC_CLIENT_WINDOW_NAME_PREFIX, pid);
-}
-
-#else
 #include "nscore.h"
 //
@@ -89 +61 @@
 NS_HIDDEN_(void) IPC_GetDefaultSocketPath(char *buf, PRUint32 bufLen);
 
-#endif
-
 // common shared configuration values