mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-28 17:10:59 +01:00
Code Releases Activity

Got rid of some unsigned-char/char pointer casts.

Browse source
This commit is contained in:
Wayne Davison 2005-11-15 08:44:17 +00:00
parent 915e6ff66a
commit e79af955f0
11 changed files with 86 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Src/Zle/compcore.c
View file

@ -442,7 +442,7 @@ do_completion(UNUSED(Hookdef dummy), Compldat dat)
for (n = firstnode(matchers); n; incnode(n)) for (n = firstnode(matchers); n; incnode(n))
freecmatcher((Cmatcher) getdata(n)); freecmatcher((Cmatcher) getdata(n));
zlemetall = strlen((char *)zlemetaline); zlemetall = strlen(zlemetaline);
if (zlemetacs > zlemetall) if (zlemetacs > zlemetall)
zlemetacs = zlemetall; zlemetacs = zlemetall;
popheap(); popheap();
@ -1317,7 +1317,7 @@ set_comp_sep(void)
zleparse = 1; zleparse = 1;
ocs = zlemetacs; ocs = zlemetacs;
oll = zlemetall; oll = zlemetall;
ol = (char *)zlemetaline; ol = zlemetaline;
addedx = 1; addedx = 1;
noerrs = 1; noerrs = 1;
lexsave(); lexsave();
@ -1358,7 +1358,7 @@ set_comp_sep(void)
odq = dq; odq = dq;
osq = sq; osq = sq;
inpush(dupstrspace(tmp), 0, NULL); inpush(dupstrspace(tmp), 0, NULL);
zlemetaline = (unsigned char *) tmp; zlemetaline = tmp;
zlemetall = tl - 1; zlemetall = tl - 1;
strinbeg(0); strinbeg(0);
noaliases = 1; noaliases = 1;
@ -1427,7 +1427,7 @@ set_comp_sep(void)
wb = owb; wb = owb;
we = owe; we = owe;
zlemetacs = ocs; zlemetacs = ocs;
zlemetaline = (unsigned char *) ol; zlemetaline = ol;
zlemetall = oll; zlemetall = oll;
if (cur < 0 || i < 1) if (cur < 0 || i < 1)
return 1; return 1;

14
Src/Zle/compctl.c
View file

@ -220,11 +220,11 @@ compctlread(char *name, char **args, Options ops, char *reply)
/* without -n, the current line is assigned to the given parameter as a /* without -n, the current line is assigned to the given parameter as a
scalar */ scalar */
if (OPT_ISSET(ops,'e') || OPT_ISSET(ops,'E')) { if (OPT_ISSET(ops,'e') || OPT_ISSET(ops,'E')) {
zputs((char *) zlemetaline, stdout); zputs(zlemetaline, stdout);
putchar('\n'); putchar('\n');
} }
if (!OPT_ISSET(ops,'e')) if (!OPT_ISSET(ops,'e'))
setsparam(reply, ztrdup((char *) zlemetaline)); setsparam(reply, ztrdup(zlemetaline));
} else { } else {
int i; int i;
@ -2761,7 +2761,7 @@ sep_comp_string(char *ss, char *s, int noffs)
int owe = we, owb = wb, ocs = zlemetacs, swb, swe, scs, soffs, ne = noerrs; int owe = we, owb = wb, ocs = zlemetacs, swb, swe, scs, soffs, ne = noerrs;
int sl = strlen(ss), tl, got = 0, i = 0, cur = -1, oll = zlemetall, remq; int sl = strlen(ss), tl, got = 0, i = 0, cur = -1, oll = zlemetall, remq;
int ois = instring, oib = inbackt, ona = noaliases; int ois = instring, oib = inbackt, ona = noaliases;
char *tmp, *p, *ns, *ol = (char *) zlemetaline, sav, *oaq = autoq; char *tmp, *p, *ns, *ol = zlemetaline, sav, *oaq = autoq;
char *qp, *qs, *ts, qc = '\0'; char *qp, *qs, *ts, qc = '\0';
swb = swe = soffs = 0; swb = swe = soffs = 0;
@ -2784,7 +2784,7 @@ sep_comp_string(char *ss, char *s, int noffs)
if ((remq = (*compqstack == '\\'))) if ((remq = (*compqstack == '\\')))
tmp = rembslash(tmp); tmp = rembslash(tmp);
inpush(dupstrspace(tmp), 0, NULL); inpush(dupstrspace(tmp), 0, NULL);
zlemetaline = (unsigned char *) tmp; zlemetaline = tmp;
zlemetall = tl - 1; zlemetall = tl - 1;
strinbeg(0); strinbeg(0);
noaliases = 1; noaliases = 1;
@ -2831,7 +2831,7 @@ sep_comp_string(char *ss, char *s, int noffs)
wb = owb; wb = owb;
we = owe; we = owe;
zlemetacs = ocs; zlemetacs = ocs;
zlemetaline = (unsigned char *) ol; zlemetaline = ol;
zlemetall = oll; zlemetall = oll;
if (cur < 0 || i < 1) if (cur < 0 || i < 1)
return 1; return 1;
@ -3213,7 +3213,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
char save = zlemetaline[zlemetacs]; char save = zlemetaline[zlemetacs];
zlemetaline[zlemetacs] = 0; zlemetaline[zlemetacs] = 0;
lppre = dupstring((char *) zlemetaline + wb + lppre = dupstring(zlemetaline + wb +
(qipre && *qipre ? (qipre && *qipre ?
(strlen(qipre) - (strlen(qipre) -
(*qipre == '\'' || *qipre == '\"')) : 0)); (*qipre == '\'' || *qipre == '\"')) : 0));
@ -3249,7 +3249,7 @@ makecomplistflags(Compctl cc, char *s, int incmd, int compadd)
end -= ql - (qisuf[ql-1] == '\'' || qisuf[ql-1] == '"'); end -= ql - (qisuf[ql-1] == '\'' || qisuf[ql-1] == '"');
} }
zlemetaline[end] = 0; zlemetaline[end] = 0;
lpsuf = dupstring((char *) (zlemetaline + zlemetacs)); lpsuf = dupstring(zlemetaline + zlemetacs);
zlemetaline[end] = save; zlemetaline[end] = save;
if (brend) { if (brend) {
Brinfo bp; Brinfo bp;

36
Src/Zle/complist.c
View file

@ -1855,16 +1855,16 @@ setmstatus(char *status, char *sline, int sll, int scs,
*llp = zlemetall; *llp = zlemetall;
*lenp = lastend - wb; *lenp = lastend - wb;
ret = dupstring((char *) zlemetaline); ret = dupstring(zlemetaline);
p = (char *) zhalloc(zlemetacs - wb + 1); p = (char *) zhalloc(zlemetacs - wb + 1);
strncpy(p, (char *) zlemetaline + wb, zlemetacs - wb); strncpy(p, zlemetaline + wb, zlemetacs - wb);
p[zlemetacs - wb] = '\0'; p[zlemetacs - wb] = '\0';
if (lastend < zlemetacs) if (lastend < zlemetacs)
s = ""; s = "";
else { else {
s = (char *) zhalloc(lastend - zlemetacs + 1); s = (char *) zhalloc(lastend - zlemetacs + 1);
strncpy(s, (char *) zlemetaline + zlemetacs, lastend - zlemetacs); strncpy(s, zlemetaline + zlemetacs, lastend - zlemetacs);
s[lastend - zlemetacs] = '\0'; s[lastend - zlemetacs] = '\0';
} }
zlemetacs = 0; zlemetacs = 0;
@ -2109,7 +2109,7 @@ domenuselect(Hookdef dummy, Chdata dat)
zlemetacs = 0; zlemetacs = 0;
foredel(zlemetall); foredel(zlemetall);
spaceinline(l); spaceinline(l);
strncpy((char *) zlemetaline, origline, l); strncpy(zlemetaline, origline, l);
zlemetacs = origcs; zlemetacs = origcs;
setmstatus(status, NULL, 0 , 0, NULL, NULL, NULL); setmstatus(status, NULL, 0 , 0, NULL, NULL, NULL);
} else if (strpfx("search", s)) { } else if (strpfx("search", s)) {
@ -2210,16 +2210,15 @@ domenuselect(Hookdef dummy, Chdata dat)
* completion we don't want that, we always want to * completion we don't want that, we always want to
* be able to type the next character. * be able to type the next character.
*/ */
modeline = dupstring((char *)zlemetaline); modeline = dupstring(zlemetaline);
modecs = zlemetacs; modecs = zlemetacs;
modell = zlemetall; modell = zlemetall;
modelen = minfo.len; modelen = minfo.len;
} }
first = 0; first = 0;
if (mode == MM_INTER) { if (mode == MM_INTER)
statusline = stringaszleline((unsigned char *)status, 0, statusline = stringaszleline(status, 0, &statusll, NULL, NULL);
&statusll, NULL, NULL); else if (mode) {
} else if (mode) {
int l = sprintf(status, "%s%sisearch%s: ", int l = sprintf(status, "%s%sisearch%s: ",
((msearchstate & MS_FAILED) ? "failed " : ""), ((msearchstate & MS_FAILED) ? "failed " : ""),
((msearchstate & MS_WRAPPED) ? "wrapped " : ""), ((msearchstate & MS_WRAPPED) ? "wrapped " : ""),
@ -2227,8 +2226,7 @@ domenuselect(Hookdef dummy, Chdata dat)
strncat(status, msearchstr, MAX_STATUS - l - 1); strncat(status, msearchstr, MAX_STATUS - l - 1);
statusline = stringaszleline((unsigned char *)status, 0, statusline = stringaszleline(status, 0, &statusll, NULL, NULL);
&statusll, NULL, NULL);
} else { } else {
statusline = NULL; statusline = NULL;
statusll = 0; statusll = 0;
@ -2312,7 +2310,7 @@ domenuselect(Hookdef dummy, Chdata dat)
zlemetacs = 0; zlemetacs = 0;
foredel(zlemetall); foredel(zlemetall);
spaceinline(l); spaceinline(l);
strncpy((char *) zlemetaline, origline, l); strncpy(zlemetaline, origline, l);
zlemetacs = origcs; zlemetacs = origcs;
setmstatus(status, NULL, 0, 0, NULL, NULL, NULL); setmstatus(status, NULL, 0, 0, NULL, NULL, NULL);
@ -2328,7 +2326,7 @@ domenuselect(Hookdef dummy, Chdata dat)
s->prev = u; s->prev = u;
u = s; u = s;
s->line = dupstring((char *) zlemetaline); s->line = dupstring(zlemetaline);
s->cs = zlemetacs; s->cs = zlemetacs;
s->mline = mline; s->mline = mline;
s->mlbeg = mlbeg; s->mlbeg = mlbeg;
@ -2371,7 +2369,7 @@ domenuselect(Hookdef dummy, Chdata dat)
zlemetacs = 0; zlemetacs = 0;
foredel(zlemetall); foredel(zlemetall);
spaceinline(l); spaceinline(l);
strncpy((char *) zlemetaline, origline, l); strncpy(zlemetaline, origline, l);
zlemetacs = origcs; zlemetacs = origcs;
if (cmd == Th(z_selfinsert)) if (cmd == Th(z_selfinsert))
@ -2399,7 +2397,7 @@ domenuselect(Hookdef dummy, Chdata dat)
if (nmatches < 1 || !minfo.cur || !*(minfo.cur)) { if (nmatches < 1 || !minfo.cur || !*(minfo.cur)) {
nolist = 1; nolist = 1;
if (mode == MM_INTER) { if (mode == MM_INTER) {
statusline = stringaszleline((unsigned char *)status, 0, statusline = stringaszleline(status, 0,
&statusll, NULL, NULL); &statusll, NULL, NULL);
} else { } else {
/* paranoia */ /* paranoia */
@ -2444,7 +2442,7 @@ domenuselect(Hookdef dummy, Chdata dat)
mode = 0; mode = 0;
s->prev = u; s->prev = u;
u = s; u = s;
s->line = dupstring((char *) zlemetaline); s->line = dupstring(zlemetaline);
s->cs = zlemetacs; s->cs = zlemetacs;
s->mline = mline; s->mline = mline;
s->mlbeg = mlbeg; s->mlbeg = mlbeg;
@ -2502,7 +2500,7 @@ domenuselect(Hookdef dummy, Chdata dat)
zlemetacs = 0; zlemetacs = 0;
foredel(zlemetall); foredel(zlemetall);
spaceinline(l = strlen(u->line)); spaceinline(l = strlen(u->line));
strncpy((char *) zlemetaline, u->line, l); strncpy(zlemetaline, u->line, l);
zlemetacs = u->cs; zlemetacs = u->cs;
menuacc = u->acc; menuacc = u->acc;
memcpy(&minfo, &(u->info), sizeof(struct menuinfo)); memcpy(&minfo, &(u->info), sizeof(struct menuinfo));
@ -2540,7 +2538,7 @@ domenuselect(Hookdef dummy, Chdata dat)
if (nolist) { if (nolist) {
if (mode == MM_INTER) { if (mode == MM_INTER) {
statusline = stringaszleline((unsigned char *)status, 0, statusline = stringaszleline(status, 0,
&statusll, NULL, NULL); &statusll, NULL, NULL);
} else { } else {
/* paranoia */ /* paranoia */
@ -2891,7 +2889,7 @@ domenuselect(Hookdef dummy, Chdata dat)
zlemetacs = 0; zlemetacs = 0;
foredel(zlemetall); foredel(zlemetall);
spaceinline(origll); spaceinline(origll);
strncpy((char *) zlemetaline, origline, origll); strncpy(zlemetaline, origline, origll);
zlemetacs = origcs; zlemetacs = origcs;
minfo.len = modelen; minfo.len = modelen;
} else { } else {

10
Src/Zle/compresult.c
View file

@ -470,7 +470,7 @@ cline_str(Cline l, int ins, int *csp, LinkList posl)
* requested, we copy it and remove from the line. */ * requested, we copy it and remove from the line. */
char *r = zalloc((i = zlemetacs - ocs) + 1); char *r = zalloc((i = zlemetacs - ocs) + 1);
memcpy(r, (char *) (zlemetaline + ocs), i); memcpy(r, zlemetaline + ocs, i);
r[i] = '\0'; r[i] = '\0';
zlemetacs = ocs; zlemetacs = ocs;
foredel(i); foredel(i);
@ -629,7 +629,7 @@ instmatch(Cmatch m, int *scs)
ocs += l; ocs += l;
} }
lastprebr = (char *) zalloc(pcs - a + 1); lastprebr = (char *) zalloc(pcs - a + 1);
memcpy(lastprebr, (char *) zlemetaline + a, pcs - a); memcpy(lastprebr, zlemetaline + a, pcs - a);
lastprebr[pcs - a] = '\0'; lastprebr[pcs - a] = '\0';
zlemetacs = ocs; zlemetacs = ocs;
} }
@ -671,7 +671,7 @@ instmatch(Cmatch m, int *scs)
} }
if (brend) { if (brend) {
lastpostbr = (char *) zalloc(zlemetacs - brb + 1); lastpostbr = (char *) zalloc(zlemetacs - brb + 1);
memcpy(lastpostbr, (char *) zlemetaline + brb, zlemetacs - brb); memcpy(lastpostbr, zlemetaline + brb, zlemetacs - brb);
lastpostbr[zlemetacs - brb] = '\0'; lastpostbr[zlemetacs - brb] = '\0';
} }
lastend = zlemetacs; lastend = zlemetacs;
@ -771,7 +771,7 @@ do_ambiguous(void)
/* First remove the old string from the line. */ /* First remove the old string from the line. */
tcs = zlemetacs; tcs = zlemetacs;
zlemetacs = wb; zlemetacs = wb;
memcpy(old, (char *) zlemetaline + wb, we - wb); memcpy(old, zlemetaline + wb, we - wb);
foredel(we - wb); foredel(we - wb);
/* Now get the unambiguous string and insert it into the line. */ /* Now get the unambiguous string and insert it into the line. */
@ -798,7 +798,7 @@ do_ambiguous(void)
/* la is non-zero if listambiguous may be used. Copying and /* la is non-zero if listambiguous may be used. Copying and
* comparing the line looks like BFI but it is the easiest * comparing the line looks like BFI but it is the easiest
* solution. Really. */ * solution. Really. */
la = (zlemetall != origll || strncmp(origline, (char *) zlemetaline, zlemetall)); la = (zlemetall != origll || strncmp(origline, zlemetaline, zlemetall));
/* If REC_EXACT and AUTO_MENU are set and what we inserted is an * /* If REC_EXACT and AUTO_MENU are set and what we inserted is an *
* exact match, we want menu completion the next time round * * exact match, we want menu completion the next time round *

30
Src/Zle/zle_hist.c
View file

@ -85,8 +85,7 @@ zletext(Histent ent, struct zle_text *zt)
} }
duptext = ztrdup(ent->text); duptext = ztrdup(ent->text);
zt->text = stringaszleline((unsigned char *)duptext, 0, zt->text = stringaszleline(duptext, 0, &zt->len, NULL, NULL);
&zt->len, NULL, NULL);
zsfree(duptext); zsfree(duptext);
zt->alloced = 1; zt->alloced = 1;
} }
@ -355,9 +354,9 @@ historysearchbackward(char **args)
zmult = n; zmult = n;
return ret; return ret;
} }
if (*args) { if (*args)
str = stringaszleline((unsigned char *)*args, 0, &hp, NULL, NULL); str = stringaszleline(*args, 0, &hp, NULL, NULL);
} else { else {
if (histline == curhist || histline != srch_hl || zlecs != srch_cs || if (histline == curhist || histline != srch_hl || zlecs != srch_cs ||
mark != 0 || ZS_memcmp(srch_str, zleline, histpos) != 0) { mark != 0 || ZS_memcmp(srch_str, zleline, histpos) != 0) {
zfree(srch_str, histpos); zfree(srch_str, histpos);
@ -414,9 +413,9 @@ historysearchforward(char **args)
zmult = n; zmult = n;
return ret; return ret;
} }
if (*args) { if (*args)
str = stringaszleline((unsigned char *)*args, 0, &hp, NULL, NULL); str = stringaszleline(*args, 0, &hp, NULL, NULL);
} else { else {
if (histline == curhist || histline != srch_hl || zlecs != srch_cs || if (histline == curhist || histline != srch_hl || zlecs != srch_cs ||
mark != 0 || ZS_memcmp(srch_str, zleline, histpos) != 0) { mark != 0 || ZS_memcmp(srch_str, zleline, histpos) != 0) {
zfree(srch_str, histpos * ZLE_CHAR_SIZE); zfree(srch_str, histpos * ZLE_CHAR_SIZE);
@ -539,7 +538,7 @@ insertlastword(char **args)
if (lastinsert && lastlen && if (lastinsert && lastlen &&
lastpos <= zlemetacs && lastpos <= zlemetacs &&
lastlen == zlemetacs - lastpos && lastlen == zlemetacs - lastpos &&
memcmp(lastinsert, (char *)&zlemetaline[lastpos], lastlen) == 0) memcmp(lastinsert, &zlemetaline[lastpos], lastlen) == 0)
deleteword = 1; deleteword = 1;
else else
lasthist = curhist; lasthist = curhist;
@ -644,7 +643,7 @@ insertlastword(char **args)
unmetafy_line(); unmetafy_line();
zs = stringaszleline((unsigned char *)s, 0, &len, NULL, NULL); zs = stringaszleline(s, 0, &len, NULL, NULL);
doinsert(zs, len); doinsert(zs, len);
free(zs); free(zs);
zmult = n; zmult = n;
@ -749,8 +748,7 @@ pushlineoredit(char **args)
if (zmult < 0) if (zmult < 0)
return 1; return 1;
if (hline && *hline) { if (hline && *hline) {
ZLE_STRING_T zhline = stringaszleline((unsigned char *)hline, 0, ZLE_STRING_T zhline = stringaszleline(hline, 0, &ics, NULL, NULL);
&ics, NULL, NULL);
sizeline(ics + zlell + 1); sizeline(ics + zlell + 1);
/* careful of overlapping copy */ /* careful of overlapping copy */
@ -787,7 +785,7 @@ pushinput(char **args)
int int
zgetline(UNUSED(char **args)) zgetline(UNUSED(char **args))
{ {
unsigned char *s = (unsigned char *)getlinknode(bufstack); char *s = getlinknode(bufstack);
if (!s) { if (!s) {
return 1; return 1;
@ -1270,8 +1268,7 @@ getvisrchstr(void)
cmd == Th(z_vicmdmode)) { cmd == Th(z_vicmdmode)) {
int newlen; int newlen;
sbuf[sptr] = ZWC('\0'); sbuf[sptr] = ZWC('\0');
visrchstr = (char *)zlelineasstring(sbuf + 1, sptr - 1, 0, &newlen, visrchstr = zlelineasstring(sbuf+1, sptr-1, 0, &newlen, NULL, 0);
NULL, 0);
if (!newlen) { if (!newlen) {
zsfree(visrchstr); zsfree(visrchstr);
visrchstr = ztrdup(vipenultsrchstr); visrchstr = ztrdup(vipenultsrchstr);
@ -1391,8 +1388,7 @@ virepeatsearch(UNUSED(char **args))
n = -n; n = -n;
visrchsense = -visrchsense; visrchsense = -visrchsense;
} }
srcstr = stringaszleline((unsigned char *)visrchstr, 0, srcstr = stringaszleline(visrchstr, 0, &srclen, NULL, NULL);
&srclen, NULL, NULL);
if (!(he = quietgethist(histline))) if (!(he = quietgethist(histline)))
return 1; return 1;
while ((he = movehistent(he, visrchsense, hist_skip_flags))) { while ((he = movehistent(he, visrchsense, hist_skip_flags))) {

25
Src/Zle/zle_misc.c
View file

@ -476,8 +476,7 @@ whatcursorposition(UNUSED(char **args))
* convert a single character, remembering it may * convert a single character, remembering it may
* turn into a multibyte string or be metafied. * turn into a multibyte string or be metafied.
*/ */
mbstr = (char *)zlelineasstring(zleline+zlecs, 1, 0, mbstr = zlelineasstring(zleline+zlecs, 1, 0, &len, NULL, 1);
&len, NULL, 1);
strcpy(s, mbstr); strcpy(s, mbstr);
s += len; s += len;
} }
@ -651,7 +650,7 @@ copyprevshellword(UNUSED(char **args))
LinkList l; LinkList l;
LinkNode n; LinkNode n;
int i; int i;
unsigned char *p = NULL; char *p = NULL;
if (zmult <= 0) if (zmult <= 0)
return 1; return 1;
@ -662,7 +661,7 @@ copyprevshellword(UNUSED(char **args))
return 1; return 1;
for (n = firstnode(l); n; incnode(n)) for (n = firstnode(l); n; incnode(n))
if (!i--) { if (!i--) {
p = (unsigned char *)getdata(n); p = getdata(n);
break; break;
} }
} }
@ -792,7 +791,7 @@ executenamedcommand(char *prmt)
clearlist = 1; clearlist = 1;
/* prmt may be constant */ /* prmt may be constant */
prmt = ztrdup(prmt); prmt = ztrdup(prmt);
zprmt = stringaszleline((unsigned char *)prmt, 0, &l, NULL, NULL); zprmt = stringaszleline(prmt, 0, &l, NULL, NULL);
cmdbuf = zhalloc((l + NAMLEN + 2) * ZLE_CHAR_SIZE); cmdbuf = zhalloc((l + NAMLEN + 2) * ZLE_CHAR_SIZE);
ZS_memcpy(cmdbuf, zprmt, l); ZS_memcpy(cmdbuf, zprmt, l);
free(zprmt); free(zprmt);
@ -875,8 +874,7 @@ executenamedcommand(char *prmt)
Thingy r; Thingy r;
unambiguous: unambiguous:
*ptr = 0; *ptr = 0;
namedcmdstr = (char *)zlelineasstring(cmdbuf, len, 0, namedcmdstr = zlelineasstring(cmdbuf, len, 0, NULL, NULL, 0);
NULL, NULL, 0);
r = rthingy(namedcmdstr); r = rthingy(namedcmdstr);
free(namedcmdstr); free(namedcmdstr);
namedcmdstr = NULL; namedcmdstr = NULL;
@ -906,8 +904,7 @@ executenamedcommand(char *prmt)
namedcmdll = newlinklist(); namedcmdll = newlinklist();
namedcmdstr = (char *)zlelineasstring(cmdbuf, len, 0, namedcmdstr = zlelineasstring(cmdbuf, len, 0, NULL, NULL, 0);
NULL, NULL, 0);
scanhashtable(thingytab, 1, 0, DISABLED, scancompcmd, 0); scanhashtable(thingytab, 1, 0, DISABLED, scancompcmd, 0);
free(namedcmdstr); free(namedcmdstr);
namedcmdstr = NULL; namedcmdstr = NULL;
@ -929,9 +926,8 @@ executenamedcommand(char *prmt)
zmult = zmultsav; zmult = zmultsav;
} else if (!nextnode(firstnode(namedcmdll))) { } else if (!nextnode(firstnode(namedcmdll))) {
char *peekstr = ztrdup(peekfirst(namedcmdll)); char *peekstr = ztrdup(peekfirst(namedcmdll));
ZLE_STRING_T ztmp = ZLE_STRING_T ztmp = stringaszleline(peekstr, 0, &len,
stringaszleline((unsigned char *)peekstr, 0, &len, NULL, NULL);
NULL, NULL);
zsfree(peekstr); zsfree(peekstr);
ZS_memcpy(ptr = cmdbuf, ztmp, len); ZS_memcpy(ptr = cmdbuf, ztmp, len);
ptr += len; ptr += len;
@ -941,9 +937,8 @@ executenamedcommand(char *prmt)
} else { } else {
int ltmp; int ltmp;
char *peekstr = ztrdup(peekfirst(namedcmdll)); char *peekstr = ztrdup(peekfirst(namedcmdll));
ZLE_STRING_T ztmp = ZLE_STRING_T ztmp = stringaszleline(peekstr, 0, &ltmp,
stringaszleline((unsigned char *)peekstr, 0, &ltmp, NULL, NULL);
NULL, NULL);
zsfree(peekstr); zsfree(peekstr);
ZS_memcpy(cmdbuf, ztmp, ltmp); ZS_memcpy(cmdbuf, ztmp, ltmp);
free(ztmp); free(ztmp);

62
Src/Zle/zle_params.c
View file

@ -190,9 +190,8 @@ static char *
get_buffer(UNUSED(Param pm)) get_buffer(UNUSED(Param pm))
{ {
if (zlemetaline != 0) if (zlemetaline != 0)
return dupstring((char *)zlemetaline); return dupstring(zlemetaline);
else return zlelineasstring(zleline, zlell, 0, NULL, NULL, 1);
return (char *)zlelineasstring(zleline, zlell, 0, NULL, NULL, 1);
} }
/**/ /**/
@ -222,8 +221,7 @@ get_cursor(UNUSED(Param pm))
free(tmpline); free(tmpline);
return tmpcs; return tmpcs;
} }
else return zlecs;
return zlecs;
} }
/**/ /**/
@ -253,7 +251,7 @@ set_lbuffer(UNUSED(Param pm), char *x)
int len; int len;
if (x && *x != ZWC('\0')) if (x && *x != ZWC('\0'))
y = stringaszleline((unsigned char *)x, 0, &len, NULL, NULL); y = stringaszleline(x, 0, &len, NULL, NULL);
else else
y = ZWS(""), len = 0; y = ZWS(""), len = 0;
sizeline(zlell - zlecs + len); sizeline(zlell - zlecs + len);
@ -273,9 +271,8 @@ static char *
get_lbuffer(UNUSED(Param pm)) get_lbuffer(UNUSED(Param pm))
{ {
if (zlemetaline != NULL) if (zlemetaline != NULL)
return dupstrpfx((char *)zlemetaline, zlemetacs); return dupstrpfx(zlemetaline, zlemetacs);
else return zlelineasstring(zleline, zlecs, 0, NULL, NULL, 1);
return (char *)zlelineasstring(zleline, zlecs, 0, NULL, NULL, 1);
} }
/**/ /**/
@ -286,7 +283,7 @@ set_rbuffer(UNUSED(Param pm), char *x)
int len; int len;
if (x && *x != ZWC('\0')) if (x && *x != ZWC('\0'))
y = stringaszleline((unsigned char *)x, 0, &len, NULL, NULL); y = stringaszleline(x, 0, &len, NULL, NULL);
else else
y = ZWS(""), len = 0; y = ZWS(""), len = 0;
sizeline(zlell = zlecs + len); sizeline(zlell = zlecs + len);
@ -304,9 +301,7 @@ get_rbuffer(UNUSED(Param pm))
{ {
if (zlemetaline != NULL) if (zlemetaline != NULL)
return dupstrpfx((char *)zleline + zlemetacs, zlemetall - zlemetacs); return dupstrpfx((char *)zleline + zlemetacs, zlemetall - zlemetacs);
else return zlelineasstring(zleline + zlecs, zlell - zlecs, 0, NULL, NULL, 1);
return (char *)zlelineasstring(zleline + zlecs, zlell - zlecs,
0, NULL, NULL, 1);
} }
/**/ /**/
@ -315,8 +310,7 @@ get_prebuffer(UNUSED(Param pm))
{ {
if (chline) if (chline)
return dupstrpfx(chline, hptr - chline); return dupstrpfx(chline, hptr - chline);
else return dupstring("");
return dupstring("");
} }
/**/ /**/
@ -335,10 +329,9 @@ get_widgetfunc(UNUSED(Param pm))
if (flags & WIDGET_INT) if (flags & WIDGET_INT)
return ".internal"; /* Don't see how this can ever be returned... */ return ".internal"; /* Don't see how this can ever be returned... */
else if (flags & WIDGET_NCOMP) if (flags & WIDGET_NCOMP)
return widget->u.comp.func; return widget->u.comp.func;
else return widget->u.fnnam;
return widget->u.fnnam;
} }
/**/ /**/
@ -350,10 +343,9 @@ get_widgetstyle(UNUSED(Param pm))
if (flags & WIDGET_INT) if (flags & WIDGET_INT)
return ".internal"; /* Don't see how this can ever be returned... */ return ".internal"; /* Don't see how this can ever be returned... */
else if (flags & WIDGET_NCOMP) if (flags & WIDGET_NCOMP)
return widget->u.comp.wid; return widget->u.comp.wid;
else return "";
return "";
} }
/**/ /**/
@ -440,10 +432,8 @@ static char *
get_cutbuffer(UNUSED(Param pm)) get_cutbuffer(UNUSED(Param pm))
{ {
if (cutbuf.buf) if (cutbuf.buf)
return (char *) return zlelineasstring(cutbuf.buf, cutbuf.len, 0, NULL, NULL, 1);
zlelineasstring(cutbuf.buf, cutbuf.len, 0, NULL, NULL, 1); return "";
else
return "";
} }
@ -456,7 +446,7 @@ set_cutbuffer(UNUSED(Param pm), char *x)
cutbuf.flags = 0; cutbuf.flags = 0;
if (x) { if (x) {
int n; int n;
cutbuf.buf = stringaszleline((unsigned char *)x, 0, &n, NULL, NULL); cutbuf.buf = stringaszleline(x, 0, &n, NULL, NULL);
cutbuf.len = n; cutbuf.len = n;
free(x); free(x);
} else { } else {
@ -511,8 +501,7 @@ set_killring(UNUSED(Param pm), char **x)
int n, len = strlen(*p); int n, len = strlen(*p);
kptr = kring + kpos; kptr = kring + kpos;
kptr->buf = stringaszleline((unsigned char *)*p, 0, &n, kptr->buf = stringaszleline(*p, 0, &n, NULL, NULL);
NULL, NULL);
kptr->len = n; kptr->len = n;
zfree(*p, len+1); zfree(*p, len+1);
@ -547,8 +536,7 @@ get_killring(UNUSED(Param pm))
if (kptr->buf) if (kptr->buf)
{ {
/* Allocate on heap. */ /* Allocate on heap. */
*p++ = (char *)zlelineasstring(kptr->buf, kptr->len, *p++ = zlelineasstring(kptr->buf, kptr->len, 0, NULL, NULL, 1);
0, NULL, NULL, 1);
} }
else else
*p++ = dupstring(""); *p++ = dupstring("");
@ -578,7 +566,7 @@ set_prepost(ZLE_STRING_T *textvar, int *lenvar, char *x)
*lenvar = 0; *lenvar = 0;
} }
if (x) { if (x) {
*textvar = stringaszleline((unsigned char *)x, 0, lenvar, NULL, NULL); *textvar = stringaszleline(x, 0, lenvar, NULL, NULL);
free(x); free(x);
} }
} }
@ -586,7 +574,7 @@ set_prepost(ZLE_STRING_T *textvar, int *lenvar, char *x)
static char * static char *
get_prepost(ZLE_STRING_T text, int len) get_prepost(ZLE_STRING_T text, int len)
{ {
return (char *)zlelineasstring(text, len, 0, NULL, NULL, 1); return zlelineasstring(text, len, 0, NULL, NULL, 1);
} }
/**/ /**/
@ -631,11 +619,11 @@ free_prepostdisplay(void)
static char * static char *
get_lsearch(UNUSED(Param pm)) get_lsearch(UNUSED(Param pm))
{ {
if (previous_search_len) if (previous_search_len) {
return (char *)zlelineasstring(previous_search, previous_search_len, 0, return zlelineasstring(previous_search, previous_search_len, 0,
NULL, NULL, 1); NULL, NULL, 1);
else }
return ""; return "";
} }
/**/ /**/

6
Src/Zle/zle_thingy.c
View file

@ -415,10 +415,8 @@ bin_zle_refresh(UNUSED(char *name), char **args, Options ops, UNUSED(char func))
statusline = NULL; statusline = NULL;
statusll = 0; statusll = 0;
if (*args) { if (*args) {
if (**args) { if (**args)
statusline = stringaszleline((unsigned char *)*args, 0, &statusll, statusline = stringaszleline(*args, 0, &statusll, NULL, NULL);
NULL, NULL);
}
if (*++args) { if (*++args) {
LinkList l = newlinklist(); LinkList l = newlinklist();
int zmultsav = zmult; int zmultsav = zmult;

2
Src/hashtable.c
View file

@ -337,7 +337,7 @@ hnamcmp(const void *ap, const void *bp)
{ {
HashNode a = *(HashNode *)ap; HashNode a = *(HashNode *)ap;
HashNode b = *(HashNode *)bp; HashNode b = *(HashNode *)bp;
return ztrcmp((unsigned char *) a->nam, (unsigned char *) b->nam); return ztrcmp(a->nam, b->nam);
} }
/* Scan the nodes in a hash table and execute scanfunc on nodes based on /* Scan the nodes in a hash table and execute scanfunc on nodes based on

3
Src/input.c
View file

@ -275,8 +275,7 @@ inputline(void)
int flags = ZLRF_HISTORY|ZLRF_NOSETTY; int flags = ZLRF_HISTORY|ZLRF_NOSETTY;
if (isset(IGNOREEOF)) if (isset(IGNOREEOF))
flags |= ZLRF_IGNOREEOF; flags |= ZLRF_IGNOREEOF;
ingetcline = (char *)zlereadptr(ingetcpmptl, ingetcpmptr, flags, ingetcline = zlereadptr(ingetcpmptl, ingetcpmptr, flags, context);
context);
histdone |= HISTFLAG_SETTY; histdone |= HISTFLAG_SETTY;
} }
if (!ingetcline) { if (!ingetcline) {

2
Src/loop.c
View file

@ -245,7 +245,7 @@ execselect(Estate state, UNUSED(int do_exec))
int oef = errflag; int oef = errflag;
isfirstln = 1; isfirstln = 1;
str = (char *)zlereadptr(&prompt3, NULL, 0, ZLCON_SELECT); str = zlereadptr(&prompt3, NULL, 0, ZLCON_SELECT);
if (errflag) if (errflag)
str = NULL; str = NULL;
errflag = oef; errflag = oef;