From owner-p4-projects@FreeBSD.ORG  Wed Jun  2 07:56:26 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24A44106567D; Wed,  2 Jun 2010 07:56:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CDEE81065674
	for <perforce@FreeBSD.org>; Wed,  2 Jun 2010 07:56:25 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BC1188FC0A
	for <perforce@FreeBSD.org>; Wed,  2 Jun 2010 07:56:25 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o527uPWJ027582
	for <perforce@FreeBSD.org>; Wed, 2 Jun 2010 07:56:25 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o527uPA2027580
	for perforce@freebsd.org; Wed, 2 Jun 2010 07:56:25 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Wed, 2 Jun 2010 07:56:25 GMT
Message-Id: <201006020756.o527uPA2027580@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179074 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Jun 2010 07:56:26 -0000

http://p4web.freebsd.org/@@179074?ac=10

Change 179074 by gcooper@gcooper-bayonetta on 2010/06/02 07:56:01

	kientzle is right. I should use ssize_t instead of off_t for the sake
	of semantic correctness.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#21 edit
.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#14 edit

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#21 (text+ko) ====

@@ -269,13 +269,13 @@
  * Return the number of bytes successfully written out to str or -1 on
  * failure.
  */
-off_t
+ssize_t
 write_file(const char *name, const char *str)
 {
 	int fd = -1;
 	int serrno;
-	off_t written_len = -1;
 	size_t len;
+	ssize_t written_len = -1;
 
 	errno = 0;
 
@@ -291,7 +291,7 @@
 
 	}
 
-	return (off_t) (errno == 0 && written_len > 0 ? written_len : -1);
+	return (errno == 0 && written_len > 0 ? written_len : -1);
 
 }
 

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/pkg.h#14 (text+ko) ====

@@ -175,7 +175,7 @@
 const char	*fileGetURL(const char *, const char *, int);
 char		*fileFindByPath(const char *, const char *);
 char		*fileGetContents(const char *);
-off_t		write_file(const char *, const char *);
+ssize_t		write_file(const char *, const char *);
 int		move_file(const char *, const char *, const char *);
 int		delete_hierarchy(const char *, Boolean, Boolean);
 char*		unpack_to_buffer(const char *, const char *);