mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-03 10:21:46 +02:00
Code Releases Activity

Paul 28538 / me 28540 / couple of unposted casts:

Browse source 
use char * for pointer arithmetic rather than void *
This commit is contained in:
Peter Stephenson 2010-12-20 10:28:43 +00:00
parent c8d07027c8
commit a7bc22ca00
7 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,10 @@
2010-12-20 Peter Stephenson <pws@csr.com>
* Paul Ackersviller: 28538: as modified in 28540 plus a couple
of casts to char * I missed: Src/init.c,Src/input.c,
Src/parse.c, Src/prototypes.h, Src/utils.c, Src/Zle/zle_main.c:
pointer arithmetic needs to be done with char *, not void *.
2010-12-19 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 28537: Src/lex.c, Test/D04parameter.ztst: word splitting on
@ -14003,5 +14010,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5160 $
* $Revision: 1.5161 $
*****************************************************

2
Src/Zle/zle_main.c
View file

@ -1132,7 +1132,7 @@ zleread(char **lp, char **rp, int flags, int context)
pptbuf = unmetafy(promptexpand(lp ? *lp : NULL, 0, NULL, NULL,
&pmpt_attr),
&pptlen);
write_loop(2, (WRITE_ARG_2_T)pptbuf, pptlen);
write_loop(2, pptbuf, pptlen);
free(pptbuf);
return shingetline();
}

2
Src/init.c
View file

@ -1380,7 +1380,7 @@ VA_DCL
pptbuf = unmetafy(promptexpand(lp ? *lp : NULL, 0, NULL, NULL,
NULL),
&pptlen);
write_loop(2, (WRITE_ARG_2_T)pptbuf, pptlen);
write_loop(2, pptbuf, pptlen);
free(pptbuf);
ret = shingetline();

2
Src/input.c
View file

@ -260,7 +260,7 @@ inputline(void)
int pptlen;
pptbuf = unmetafy(promptexpand(ingetcpmptl ? *ingetcpmptl : NULL,
0, NULL, NULL, NULL), &pptlen);
write_loop(2, (WRITE_ARG_2_T)pptbuf, pptlen);
write_loop(2, pptbuf, pptlen);
free(pptbuf);
}
ingetcline = shingetline();

8
Src/parse.c
View file

@ -2765,7 +2765,7 @@ write_dump(int dfd, LinkList progs, int map, int hlen, int tlen)
fdsetflags(pre, ((map ? FDF_MAP : 0) | other));
fdsetother(pre, tlen);
strcpy(fdversion(pre), ZSH_VERSION);
write_loop(dfd, pre, FD_PRELEN * sizeof(wordcode));
write_loop(dfd, (char *)pre, FD_PRELEN * sizeof(wordcode));
for (node = firstnode(progs); node; incnode(node)) {
wcf = (WCFunc) getdata(node);
@ -2786,11 +2786,11 @@ write_dump(int dfd, LinkList progs, int map, int hlen, int tlen)
head.flags = fdhbldflags(wcf->flags, (tail - n));
if (other)
fdswap((Wordcode) &head, sizeof(head) / sizeof(wordcode));
write_loop(dfd, &head, sizeof(head));
write_loop(dfd, (char *)&head, sizeof(head));
tmp = strlen(n) + 1;
write_loop(dfd, n, tmp);
if ((tmp &= (sizeof(wordcode) - 1)))
write_loop(dfd, &head, sizeof(wordcode) - tmp);
write_loop(dfd, (char *)&head, sizeof(wordcode) - tmp);
}
for (node = firstnode(progs); node; incnode(node)) {
prog = ((WCFunc) getdata(node))->prog;
@ -2798,7 +2798,7 @@ write_dump(int dfd, LinkList progs, int map, int hlen, int tlen)
sizeof(wordcode) - 1) / sizeof(wordcode);
if (other)
fdswap(prog->prog, (((Wordcode) prog->strs) - prog->prog));
write_loop(dfd, prog->prog, tmp * sizeof(wordcode));
write_loop(dfd, (char *)prog->prog, tmp * sizeof(wordcode));
}
if (other)
break;

7
Src/prototypes.h
View file

@ -44,13 +44,6 @@ extern int tputs _((char *cp, int affcnt, int (*outc) (int)));
/* MISSING PROTOTYPES FOR VARIOUS OPERATING SYSTEMS */
/* HP/UX 9 c89 */
#if defined(__hpux) && defined(_XPG3) && !defined(_POSIX1_1988)
# define WRITE_ARG_2_T void *
#else
# define WRITE_ARG_2_T char *
#endif
#if defined(__hpux) && defined(_HPUX_SOURCE) && !defined(_XPG4_EXTENDED)
# define SELECT_ARG_2_T int *
#else

4
Src/utils.c
View file

@ -2272,7 +2272,7 @@ checkrmall(char *s)
/**/
mod_export ssize_t
read_loop(int fd, void *buf, size_t len)
read_loop(int fd, char *buf, size_t len)
{
ssize_t got = len;
@ -2298,7 +2298,7 @@ read_loop(int fd, void *buf, size_t len)
/**/
mod_export ssize_t
write_loop(int fd, const void *buf, size_t len)
write_loop(int fd, const char *buf, size_t len)
{
ssize_t wrote = len;