From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-13288-mason-zsh=primenet.com.au@sunsite.auc.dk>
Received: (qmail 15354 invoked from network); 17 Dec 2000 21:45:36 -0000
Received: from sunsite.dk (HELO sunsite.auc.dk) (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 17 Dec 2000 21:45:36 -0000
Received: (qmail 10628 invoked by alias); 17 Dec 2000 21:45:29 -0000
Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 13288
Received: (qmail 10621 invoked from network); 17 Dec 2000 21:45:29 -0000
Date: Sun, 17 Dec 2000 16:45:26 -0500
From: Clint Adams <schizo@debian.org>
To: zsh-workers@sunsite.auc.dk
Subject: PATCH: ztrapread/write casting in zftp.c
Message-ID: <20001217164526.A23597@dman.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i

This gets rid of some of gcc's warnings about incompatible pointer types.

Index: Src/Modules/zftp.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/zftp.c,v
retrieving revision 1.8
diff -u -r1.8 zftp.c
--- Src/Modules/zftp.c	2000/11/11 19:50:29	1.8
+++ Src/Modules/zftp.c	2000/12/17 21:42:51
@@ -2846,7 +2846,7 @@
 	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 @@
 	/* 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 @@
 	 * 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;
 }