external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

{array,nvtype}.c: Tidy up old debug messages

Browse source 
Those debug messages were written straight to standard error
without going through the shell's error/warning message mechanism.
They look like debug messages that aren't really supposed to appear
(no one ever sees them AFAIK).

This commit removes them, in some cases replacing them with abort()
calls so that a stack trace is generated if the unexpected thing
happens, instead of the shell continuing in an inconsistent state.
This commit is contained in:
Martijn Dekker 2022-06-03 19:27:37 +01:00
parent fb8719fe1d
commit 870883617a
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/cmd/ksh93/sh/array.c
View file

@ -155,12 +155,10 @@ static void array_setptr(register Namval_t *np, struct index_array *old, struct
register Namfun_t **fp = &np->nvfun;
while(*fp && *fp!= &old->header.hdr)
fp = &((*fp)->next);
if(*fp)
{
new->header.hdr.next = (*fp)->next;
*fp = &new->header.hdr;
}
else sfprintf(sfstderr,"discipline not replaced\n");
if(!*fp)
abort();
new->header.hdr.next = (*fp)->next;
*fp = &new->header.hdr;
}
/*

22
src/cmd/ksh93/sh/nvtype.c
View file

@ -610,10 +610,7 @@ static int typeinfo(Opt_t* op, Sfio_t *out, const char *str, Optdisc_t *fp)
np = nv_open(cp=stakptr(offset), sh.var_tree, NV_NOADD|NV_VARNAME);
stakseek(offset);
if(!np)
{
sfprintf(sfstderr,"%s: no such variable\n",cp);
return(-1);
}
if(!(dp=(Namtype_t*)nv_hasdisc(np,&type_disc)))
{
Namfun_t *fp;
@ -623,10 +620,7 @@ static int typeinfo(Opt_t* op, Sfio_t *out, const char *str, Optdisc_t *fp)
break;
}
if(!fp)
{
sfprintf(sfstderr,"%s: not a type\n",np->nvname);
return(-1);
}
if(strcmp(str,"other")==0)
return(0);
tp = fp->type;
@ -762,14 +756,9 @@ found:
break;
}
}
if(np)
{
nv_onattr(mp,NV_NOFREE);
if(!nv_setdisc(np,cp, mp, (Namfun_t*)np))
sfprintf(sfstderr," nvsetdisc failed name=%s sp=%s cp=%s\n",np->nvname,sp,cp);
}
else
sfprintf(sfstderr,"can't set discipline %s cp=%s \n",sp,cp);
nv_onattr(mp,NV_NOFREE);
if(!np || !nv_setdisc(np, cp, mp, (Namfun_t*)np))
abort();
return(1);
}
@ -981,9 +970,7 @@ Namval_t *nv_mktype(Namval_t **nodes, int numnodes)
if(j < k)
{
sp = nv_getval(np);
if(nv_isvtree(np))
sfprintf(sfstderr,"initialization not implemented\n");
else if(sp)
if(!nv_isvtree(np) && sp)
nv_putval(nq,sp,0);
goto skip;
}
@ -1118,7 +1105,6 @@ Namval_t *nv_mktype(Namval_t **nodes, int numnodes)
nq = nv_namptr(pp->nodes,++j);
if(strcmp(nq->nvname,cname)==0)
{
sfprintf(sfstderr,"%s found at k=%d\n",nq->nvname,k);
if(nq->nvalue.cp>=pp->data && nq->nvalue.cp< (char*)pp->names)
memcpy((char*)nq->nvalue.cp,np->nvalue.cp,nv_datasize(np,0));
break;