No more E{SRC,DST}DIED errno's, replaced by EDEADSRCDST.

The callers don't care about the difference and had to check 3 error
codes instead of one.

diff --git a/drivers/filter/driver.c b/drivers/filter/driver.c
index 97afc6888c8138e01f284191a5fb53edc61e5c45..dd7c4af53833648c337914bba7249deca513fa55 100644 (file)
--- a/drivers/filter/driver.c
+++ b/drivers/filter/driver.c
@@ -564,8 +564,7 @@ static int check_senda(int which)
 
        amp = &amsgtable[which];
 
-       if ((amp->flags & AMF_DONE) &&
-               (amp->result == EDEADSRCDST || amp->result == EDSTDIED)) {
+       if ((amp->flags & AMF_DONE) && (amp->result == EDEADSRCDST)) {
 
                return BD_DEAD;
        }

diff --git a/include/errno.h b/include/errno.h
index a6b6ac25a6651cc25d0f55e27f546f04bbb525bb..3a252cae619247a30f15832ded2b2a05edc818ac 100644 (file)
--- a/include/errno.h
+++ b/include/errno.h
@@ -119,8 +119,6 @@ extern int errno;             /* place where the error numbers go */
 #define EDEADSRCDST  (_SIGN 105)  /* source or destination is not alive */
 #define ENOTREADY    (_SIGN 106)  /* source or destination is not ready */
 #define EBADREQUEST  (_SIGN 107)  /* destination cannot handle request */
-#define ESRCDIED     (_SIGN 108)  /* source just died */
-#define EDSTDIED     (_SIGN 109)  /* destination just died */
 #define ETRAPDENIED  (_SIGN 110)  /* IPC trap not allowed */
 #define EDONTREPLY   (_SIGN 201)  /* pseudo-code: don't send a reply */
 

diff --git a/servers/iso9660fs/device.c b/servers/iso9660fs/device.c
index 0b8cf25cd2b7d6c239069dd30ce0126e2d0be362..1c867a8cc9249b741025732da85ed9dee4f6324f 100644 (file)
--- a/servers/iso9660fs/device.c
+++ b/servers/iso9660fs/device.c
@@ -188,7 +188,7 @@ int flags;                  /* special flags, like O_NONBLOCK */
   driver_e = driver_endpoints[(dev >> MAJOR) & BYTE].driver_e;
   
   /* See if driver is roughly valid. */
-  if (driver_e == NONE) return(EDSTDIED);
+  if (driver_e == NONE) return(EDEADSRCDST);
   
   /* The io vector copying relies on this I/O being for FS itself. */
   if(proc_e != SELF_E) {
@@ -229,7 +229,7 @@ int flags;                  /* special flags, like O_NONBLOCK */
    * - VFS sends the new driver endp for the FS proc and the request again 
    */
   if (r != OK) {
-      if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
+      if (r == EDEADSRCDST) {
           printf("ISOFS(%d) dead driver %d\n", SELF_E, driver_e);
           driver_endpoints[(dev >> MAJOR) & BYTE].driver_e = NONE;
           return(r);
@@ -302,7 +302,7 @@ message *mess_ptr;          /* pointer to message for task */
 
   r = sendrec(task_nr, mess_ptr);
        if (r != OK) {
-               if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
+               if (r == EDEADSRCDST) {
                        printf("fs: dead driver %d\n", task_nr);
                        panic(__FILE__, "should handle crashed drivers",
                                NO_NUM);

diff --git a/servers/mfs/device.c b/servers/mfs/device.c
index b428291794432eefbbaee675398d10c5cb84c649..668e18639a8c699904e92cd5b50bdec7f4ca7cd6 100644 (file)
--- a/servers/mfs/device.c
+++ b/servers/mfs/device.c
@@ -178,7 +178,7 @@ int flags;                  /* special flags, like O_NONBLOCK */
   /* See if driver is roughly valid. */
   if (driver_e == NONE) {
       printf("MFS(%d) block_dev_io: no driver for dev %x\n", SELF_E, dev);
-      return(EDSTDIED);
+      return(EDEADSRCDST);
   }
   
   /* The io vector copying relies on this I/O being for FS itself. */
@@ -220,7 +220,7 @@ int flags;                  /* special flags, like O_NONBLOCK */
    * - VFS sends the new driver endp for the FS proc and the request again 
    */
   if (r != OK) {
-      if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
+      if (r == EDEADSRCDST) {
           printf("MFS(%d) dead driver %d\n", SELF_E, driver_e);
           driver_endpoints[(dev >> MAJOR) & BYTE].driver_e = NONE;
           return r;
@@ -329,7 +329,7 @@ message *mess_ptr;          /* pointer to message for task */
 
   r = sendrec(task_nr, mess_ptr);
        if (r != OK) {
-               if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
+               if (r == EDEADSRCDST) {
                        printf("fs: dead driver %d\n", task_nr);
                        panic(__FILE__, "should handle crashed drivers",
                                NO_NUM);

diff --git a/servers/vfs/device.c b/servers/vfs/device.c
index 8ccb12b51526ae3cc92c3152f91d66b56f4a39e9..ddf980e965925bce606fb0bff4643bfd2862a895 100644 (file)
--- a/servers/vfs/device.c
+++ b/servers/vfs/device.c
@@ -158,8 +158,6 @@ PUBLIC void dev_status(message *m)
                if ((r = sendrec(m->m_source, &st)) != OK) {
                        printf("DEV_STATUS failed to %d: %d\n", m->m_source, r);
                        if (r == EDEADSRCDST) return;
-                       if (r == EDSTDIED) return;
-                       if (r == ESRCDIED) return;
                        panic(__FILE__,"couldn't sendrec for DEV_STATUS", r);
                }
 
@@ -619,7 +617,7 @@ message *mess_ptr;          /* pointer to message for task */
   proc_e = mess_ptr->IO_ENDPT;
   r = sendrec(task_nr, mess_ptr);
   if (r != OK) {
-       if (r == EDEADSRCDST || r == EDSTDIED || r == ESRCDIED) {
+       if (r == EDEADSRCDST) {
                printf("fs: dead driver %d\n", task_nr);
                dmap_unmap_by_endpt(task_nr);
                return(r);