xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kernel: more nil vs 0 cleanup in chan.c

Browse source
This commit is contained in:
cinap_lenrek 2014-08-08 17:02:10 +02:00
parent ee6409366e
commit daa15d1edb
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
sys/src/9/port/chan.c
View file

@ -290,7 +290,7 @@ newpath(char *s)
* array will not be populated correctly. The names #/ and / are * array will not be populated correctly. The names #/ and / are
* allowed, but other names with / in them draw warnings. * allowed, but other names with / in them draw warnings.
*/ */
if(strchr(s, '/') && strcmp(s, "#/") != 0 && strcmp(s, "/") != 0) if(strchr(s, '/') != nil && strcmp(s, "#/") != 0 && strcmp(s, "/") != 0)
print("newpath: %s from %#p\n", s, getcallerpc(&s)); print("newpath: %s from %#p\n", s, getcallerpc(&s));
p->mlen = 1; p->mlen = 1;
@ -320,7 +320,7 @@ copypath(Path *p)
pp->mtpt = smalloc(p->malen*sizeof pp->mtpt[0]); pp->mtpt = smalloc(p->malen*sizeof pp->mtpt[0]);
for(i=0; i<pp->mlen; i++){ for(i=0; i<pp->mlen; i++){
pp->mtpt[i] = p->mtpt[i]; pp->mtpt[i] = p->mtpt[i];
if(pp->mtpt[i]) if(pp->mtpt[i] != nil)
incref(pp->mtpt[i]); incref(pp->mtpt[i]);
} }
@ -345,7 +345,7 @@ pathclose(Path *p)
decref(&npath); decref(&npath);
free(p->s); free(p->s);
for(i=0; i<p->mlen; i++) for(i=0; i<p->mlen; i++)
if(p->mtpt[i]) if(p->mtpt[i] != nil)
cclose(p->mtpt[i]); cclose(p->mtpt[i]);
free(p->mtpt); free(p->mtpt);
free(p); free(p);
@ -421,7 +421,7 @@ addelem(Path *p, char *s, Chan *from)
if(isdotdot(s)){ if(isdotdot(s)){
fixdotdotname(p); fixdotdotname(p);
DBG("addelem %s .. => rm %p\n", p->s, p->mtpt[p->mlen-1]); DBG("addelem %s .. => rm %p\n", p->s, p->mtpt[p->mlen-1]);
if(p->mlen>1 && (c = p->mtpt[--p->mlen])){ if(p->mlen > 1 && (c = p->mtpt[--p->mlen]) != nil){
p->mtpt[p->mlen] = nil; p->mtpt[p->mlen] = nil;
cclose(c); cclose(c);
} }
@ -435,7 +435,7 @@ addelem(Path *p, char *s, Chan *from)
} }
DBG("addelem %s %s => add %p\n", p->s, s, from); DBG("addelem %s %s => add %p\n", p->s, s, from);
p->mtpt[p->mlen++] = from; p->mtpt[p->mlen++] = from;
if(from) if(from != nil)
incref(from); incref(from);
} }
return p; return p;
@ -936,7 +936,7 @@ domount(Chan **cp, Mhead **mp, Path **path)
lc = &p->mtpt[p->mlen-1]; lc = &p->mtpt[p->mlen-1];
DBG("domount %p %s => add %p (was %p)\n", p, p->s, (*mp)->from, p->mtpt[p->mlen-1]); DBG("domount %p %s => add %p (was %p)\n", p, p->s, (*mp)->from, p->mtpt[p->mlen-1]);
incref((*mp)->from); incref((*mp)->from);
if(*lc) if(*lc != nil)
cclose(*lc); cclose(*lc);
*lc = (*mp)->from; *lc = (*mp)->from;
} }
@ -959,7 +959,7 @@ undomount(Chan *c, Path *path)
print("undomount: path %s ref %ld mlen %d caller %#p\n", print("undomount: path %s ref %ld mlen %d caller %#p\n",
path->s, path->ref, path->mlen, getcallerpc(&c)); path->s, path->ref, path->mlen, getcallerpc(&c));
if(path->mlen>0 && (nc=path->mtpt[path->mlen-1]) != nil){ if(path->mlen > 0 && (nc = path->mtpt[path->mlen-1]) != nil){
DBG("undomount %p %s => remove %p\n", path, path->s, nc); DBG("undomount %p %s => remove %p\n", path, path->s, nc);
cclose(c); cclose(c);
path->mtpt[path->mlen-1] = nil; path->mtpt[path->mlen-1] = nil;
@ -1128,7 +1128,7 @@ walk(Chan **cp, char **names, int nnames, int nomount, int *nerror)
} }
for(i=0; i<n; i++){ for(i=0; i<n; i++){
mtpt = nil; mtpt = nil;
if(i==n-1 && nmh) if(i==n-1 && nmh!=nil)
mtpt = nmh->from; mtpt = nmh->from;
path = addelem(path, names[nhave+i], mtpt); path = addelem(path, names[nhave+i], mtpt);
} }
@ -1398,7 +1398,7 @@ namec(char *aname, int amode, int omode, ulong perm)
*/ */
n = chartorune(&r, up->genbuf+1)+1; n = chartorune(&r, up->genbuf+1)+1;
/* actually / is caught by parsing earlier */ /* actually / is caught by parsing earlier */
if(utfrune("M", r)) if(utfrune("M", r) != nil)
error(Enoattach); error(Enoattach);
if(up->pgrp->noattach && utfrune("|decp", r)==nil) if(up->pgrp->noattach && utfrune("|decp", r)==nil)
error(Enoattach); error(Enoattach);
@ -1527,7 +1527,7 @@ if(c->umh != nil){
c->umh = nil; c->umh = nil;
} }
/* only save the mount head if it's a multiple element union */ /* only save the mount head if it's a multiple element union */
if(m && m->mount && m->mount->next) if(m != nil && m->mount != nil && m->mount->next != nil)
c->umh = m; c->umh = m;
else else
putmhead(m); putmhead(m);
@ -1644,7 +1644,7 @@ if(c->umh != nil){
cnew->flag |= CCEXEC; cnew->flag |= CCEXEC;
if(omode & ORCLOSE) if(omode & ORCLOSE)
cnew->flag |= CRCLOSE; cnew->flag |= CRCLOSE;
if(m) if(m != nil)
putmhead(m); putmhead(m);
cclose(c); cclose(c);
c = cnew; c = cnew;
@ -1654,7 +1654,7 @@ if(c->umh != nil){
/* create failed */ /* create failed */
cclose(cnew); cclose(cnew);
if(m) if(m != nil)
putmhead(m); putmhead(m);
if(omode & OEXCL) if(omode & OEXCL)
nexterror(); nexterror();
@ -1813,7 +1813,7 @@ isdir(Chan *c)
void void
putmhead(Mhead *m) putmhead(Mhead *m)
{ {
if(m && decref(m) == 0){ if(m != nil && decref(m) == 0){
m->mount = (Mount*)0xCafeBeef; m->mount = (Mount*)0xCafeBeef;
free(m); free(m);
} }