---------------------
PatchSet 2129 
Date: 2005/11/07 22:01:03
Author: serassio
Branch: ipc
Tag: (none) 
Log:
Imported ipc changes from nt branch

Members: 
	src/DiskIO/DiskDaemon/DiskdIOStrategy.cc:1.2->1.2.14.1 

Index: squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc,v
retrieving revision 1.2
retrieving revision 1.2.14.1
diff -u -r1.2 -r1.2.14.1
--- squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc	4 Jan 2005 03:13:39 -0000	1.2
+++ squid3/src/DiskIO/DiskDaemon/DiskdIOStrategy.cc	7 Nov 2005 22:01:03 -0000	1.2.14.1
@@ -1,6 +1,6 @@
 
 /*
- * $Id: DiskdIOStrategy.cc,v 1.2 2005/01/04 03:13:39 squidadm Exp $
+ * $Id: DiskdIOStrategy.cc,v 1.2.14.1 2005/11/07 22:01:03 serassio Exp $
  *
  * DEBUG: section 79    Squid-side DISKD I/O functions.
  * AUTHOR: Duane Wessels
@@ -46,6 +46,7 @@
 #include "diomsg.h"
 /* for statfs */
 #include "Store.h"
+#include "ipc.h"
 
 diskd_stats_t diskd_stats;
 
@@ -152,8 +153,6 @@
 void
 DiskdIOStrategy::init()
 {
-    int x;
-    int rfd;
     int ikey;
     const char *args[5];
     char skey1[32];
@@ -185,18 +184,18 @@
     args[2] = skey2;
     args[3] = skey3;
     args[4] = NULL;
-    x = ipcCreate(IPC_STREAM,
-                  Config.Program.diskd,
-                  args,
-                  "diskd",
-                  &rfd,
-                  &wfd);
+    IPCResult ipcRV = ipcCreate(IPC_STREAM,
+                                Config.Program.diskd,
+                                args,
+                                "diskd");
 
-    if (x < 0)
+    if (!ipcRV.success)
         fatalf("execl: %s", Config.Program.diskd);
 
-    if (rfd != wfd)
-        comm_close(rfd);
+    wfd = ipcRV.wfd;
+
+    if (ipcRV.rfd != wfd)
+        comm_close(ipcRV.rfd);
 
     fd_note(wfd, "squid -> diskd");