From b48b27e5ba1f980baa626a9f098201cc11739eea Mon Sep 17 00:00:00 2001 From: David du Colombier <0intro@gmail.com> Date: Sat, 15 Nov 1997 00:00:00 +0000 Subject: [PATCH] Plan 9 from Bell Labs 1997-11-15 --- port/devdraw.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/port/devdraw.c b/port/devdraw.c index fc6d70fd886f870c23ca0b7ec5c5847ed38a796d..22e28bb3c90aa214ed7c4f2e6094bce20c0ce710 100644 --- a/port/devdraw.c +++ b/port/devdraw.c @@ -335,7 +335,7 @@ drawcmp(char *a, char *b, int n) } DName* -drawlookupname(int n, char *str, int err) +drawlookupname(int n, char *str) { DName *name, *ename; @@ -344,8 +344,6 @@ drawlookupname(int n, char *str, int err) for(; namename, str, n) == 0) return name; - if(err) - error(Enoname); return 0; } @@ -361,7 +359,7 @@ drawgoodname(DImage *d) return 0; if(d->name == nil) return 1; - n = drawlookupname(strlen(d->name), d->name, 0); + n = drawlookupname(strlen(d->name), d->name); if(n==nil || n->vers!=d->vers) return 0; return 1; @@ -1382,7 +1380,9 @@ drawmesg(Client *client, void *av, int n) dstid = BGLONG(a+1); if(drawlookup(client, dstid, 0)) error(Eimageexists); - dn = drawlookupname(j, (char*)a+6, 1); + dn = drawlookupname(j, (char*)a+6); + if(dn == nil) + error(Enoname); if(drawinstall(client, dstid, dn->dimage->image, 0) == 0) error(Edrawmem); di = drawlookup(client, dstid, 0); @@ -1415,7 +1415,9 @@ drawmesg(Client *client, void *av, int n) if(c) drawaddname(client, di, j, (char*)a+7); else{ - dn = drawlookupname(j, (char*)a+7, 1); + dn = drawlookupname(j, (char*)a+7); + if(dn == nil) + error(Enoname); if(dn->dimage != di) error(Ewrongname); drawdelname(dn);