diff options
Diffstat (limited to 'Src')
| -rw-r--r-- | Src/Zle/zle_main.c | 2 | ||||
| -rw-r--r-- | Src/init.c | 2 | ||||
| -rw-r--r-- | Src/input.c | 2 | ||||
| -rw-r--r-- | Src/parse.c | 8 | ||||
| -rw-r--r-- | Src/prototypes.h | 7 | ||||
| -rw-r--r-- | Src/utils.c | 4 |
6 files changed, 9 insertions, 16 deletions
diff --git a/Src/Zle/zle_main.c b/Src/Zle/zle_main.c index f9e8b7387..0ac45431d 100644 --- a/Src/Zle/zle_main.c +++ b/Src/Zle/zle_main.c @@ -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(); } diff --git a/Src/init.c b/Src/init.c index e85d3875a..3ce482488 100644 --- a/Src/init.c +++ b/Src/init.c @@ -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(); diff --git a/Src/input.c b/Src/input.c index 0e802da62..5cff22da4 100644 --- a/Src/input.c +++ b/Src/input.c @@ -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(); diff --git a/Src/parse.c b/Src/parse.c index 2953f00aa..e59a882ca 100644 --- a/Src/parse.c +++ b/Src/parse.c @@ -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; diff --git a/Src/prototypes.h b/Src/prototypes.h index 3dc5badf2..07fe2d0c5 100644 --- a/Src/prototypes.h +++ b/Src/prototypes.h @@ -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 diff --git a/Src/utils.c b/Src/utils.c index 12ffc64e1..b64530bcc 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -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; |