shithub: riscv

Info  •  Files  •  Log  •  Branches

devip: dont raise error() out of Fsprotocone()

Fsprotoclone() is not supposed to raise error, but return nil.
ipopen() seemed to assume otherwise as it setup error label
before calling Fsprotoclone(). fix ipopen(), make Fsprotoclone()
return nil instead of raising error.

--- a/sys/src/9/ip/devip.c

+++ b/sys/src/9/ip/devip.c

@@ -407,13 +407,8 @@

 	case Qclone:

 		p = f->p[PROTO(c->qid)];

 		qlock(p);

-		if(waserror()){

-			qunlock(p);

-			nexterror();

-		}

 		cv = Fsprotoclone(p, ATTACHER(c));

 		qunlock(p);

-		poperror();

 		if(cv == nil) {

 			error(Enodev);

 			break;

@@ -1285,7 +1280,7 @@

 		if(c == nil){

 			c = malloc(sizeof(Conv));

 			if(c == nil)

-				error(Enomem);

+				return nil;

 			if(waserror()){

 				qfree(c->rq);

 				qfree(c->wq);

@@ -1293,7 +1288,7 @@

 				qfree(c->sq);

 				free(c->ptcl);

 				free(c);

-				nexterror();

+				return nil;

 			}

 			c->p = p;

 			c->x = pp - p->conv;

-- 

⑨