diff options
| author | Clint Adams <clint@users.sourceforge.net> | 2000-12-17 21:47:54 +0000 |
|---|---|---|
| committer | Clint Adams <clint@users.sourceforge.net> | 2000-12-17 21:47:54 +0000 |
| commit | ef13567352fe6f583109684f24cb77d12fe3af0a (patch) | |
| tree | 16fab835b3c546bb89e291a418b3ca1dfb95b9f4 | |
| parent | 76ce03c62ce56cd5f4b6d653cb1ceeed598320fc (diff) | |
| download | zsh-ef13567352fe6f583109684f24cb77d12fe3af0a.tar.gz zsh-ef13567352fe6f583109684f24cb77d12fe3af0a.tar.xz zsh-ef13567352fe6f583109684f24cb77d12fe3af0a.zip | |
13288: cast pointers for arg 2 of ztrapread/write
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Modules/zftp.c | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 4ce81d2bf..75c56d40d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-12-17 Clint Adams <schizo@debian.org> + * 13288: Src/Modules/zftp.c: cast pointers when calling + ztrapread and ztrapwrite. + * 13287: Completion/Debian/_dpkg: complete multiple arguments for -i. diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index ef37dbdc7..5813a9144 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -2846,7 +2846,7 @@ zfclose(int leaveparams) if (!zfnopen) { /* Write the final status in case this is a subshell */ lseek(zfstatfd, zfsessno*sizeof(int), 0); - ztrapwrite(zfstatfd, zfstatusp+zfsessno, sizeof(int)); + ztrapwrite(zfstatfd, (char *)zfstatusp+zfsessno, sizeof(int)); close(zfstatfd); zfstatfd = -1; @@ -3123,7 +3123,7 @@ bin_zftp(char *name, char **args, char *ops, int func) /* Get the status in case it was set by a forked process */ int oldstatus = zfstatusp[zfsessno]; lseek(zfstatfd, 0, 0); - ztrapread(zfstatfd, zfstatusp, sizeof(int)*zfsesscnt); + ztrapread(zfstatfd, (char *)zfstatusp, sizeof(int)*zfsesscnt); if (zfsess->cfd != -1 && (zfstatusp[zfsessno] & ZFST_CLOS)) { /* got closed in subshell without us knowing */ zcfinish = 2; @@ -3212,7 +3212,7 @@ bin_zftp(char *name, char **args, char *ops, int func) * but only for the active session. */ lseek(zfstatfd, zfsessno*sizeof(int), 0); - ztrapwrite(zfstatfd, zfstatusp+zfsessno, sizeof(int)); + ztrapwrite(zfstatfd, (char *)zfstatusp+zfsessno, sizeof(int)); } return ret; } |