Changeset 7029 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/shared

Timestamp:

Feb 20, 2008 11:54:09 AM (17 years ago)

Author:

vboxsync

Message:

XPCOM/IPC: Made IPC_AddName()/IPC_RemoveName(), IPC_DefineTarget() to return a failure when the name/target is already defined or when a non-existent name/target is requested for removal.

Location:

trunk/src/libs/xpcom18a4/ipc/ipcd/shared/src

Files:

• ipcIDList.h (modified) (1 diff)
• ipcStringList.h (modified) (1 diff)
• ipcm.h (modified) (5 diffs)

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

@@ -86 +86 @@
     }
 
-    void FindAndDelete(const nsID &id)
+    PRBool FindAndDelete(const nsID &id)
     {
         ipcIDNode *node = FindNodeBefore(mHead, id);
-        if (node)
+        if (node) {
             DeleteAfter(node);
-        else
+            return PR_TRUE;
+        }
+        else if (!IsEmpty()) {
             DeleteFirst();
+            return PR_TRUE;
+        }
+
+        return PR_FALSE;
     }
 

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

@@ -92 +92 @@
     }
 
-    void FindAndDelete(const char *str)
+    PRBool FindAndDelete(const char *str)
     {
         ipcStringNode *node = FindNodeBefore(mHead, str);
-        if (node)
+        if (node) {
             DeleteAfter(node);
-        else
+            return PR_TRUE;
+        }
+        else if (!IsEmpty()) {
             DeleteFirst();
+            return PR_TRUE;
+        }
+
+        return PR_FALSE;
     }
 

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

@@ -129 +129 @@
 
 //
-// return IPCM message request index.  
+// return IPCM message request index.
 //
 static inline PRUint32
@@ -258 +258 @@
 // This request message has as its payload a null-terminated ASCII character
 // string indicating the client name to query.
-// 
+//
 
 // ACKNOWLEDGEMENTS
@@ -272 +272 @@
 // codes):
 //
-#define IPCM_OK               0  // success: generic
-#define IPCM_ERROR_GENERIC   -1  // failure: generic
-#define IPCM_ERROR_NO_CLIENT -2  // failure: client does not exist
+#define IPCM_OK                      0  // success: generic
+#define IPCM_ERROR_GENERIC          -1  // failure: generic
+#define IPCM_ERROR_NO_CLIENT        -2  // failure: client does not exist
+#define IPCM_ERROR_INVALID_ARG      -3  // failure: invalid request argument
+#define IPCM_ERROR_NO_SUCH_DATA     -4  // failure: requested data does not exist
+#define IPCM_ERROR_ALREADY_EXISTS   -5  // failure: data to set already exists
 
 //
@@ -310 +313 @@
 // This message is sent by the daemon to a client on behalf of another client.
 // The recipient is expected to unpack the contained message and process it.
-// 
+//
 // The payload of this message matches the payload of IPCM_MSG_REQ_FORWARD,
 // with the exception that the clientID field is set to the clientID of the
@@ -323 +326 @@
 //       adds no additional member variables.  |operator new| should be used
 //       to allocate one of the IPCM helper classes, e.g.:
-//         
+//
 //          ipcMessage *msg = new ipcmMessageClientHello("foo");
 //