From owner-svn-src-user@FreeBSD.ORG Thu May 15 14:37:36 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 7EC8114A;
Thu, 15 May 2014 14:37:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6CEA52E86;
Thu, 15 May 2014 14:37:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4FEbaZw023491;
Thu, 15 May 2014 14:37:36 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4FEbaJT023489;
Thu, 15 May 2014 14:37:36 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201405151437.s4FEbaJT023489@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Thu, 15 May 2014 14:37:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r266129 - user/marcel/mkimg
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 15 May 2014 14:37:36 -0000
Author: marcel
Date: Thu May 15 14:37:35 2014
New Revision: 266129
URL: http://svnweb.freebsd.org/changeset/base/266129
Log:
Give sparse_write() the same prototype as write(2) as it's supposed to
be a drop-in replacement.
Modified:
user/marcel/mkimg/mkimg.c
user/marcel/mkimg/mkimg.h
Modified: user/marcel/mkimg/mkimg.c
==============================================================================
--- user/marcel/mkimg/mkimg.c Thu May 15 14:26:11 2014 (r266128)
+++ user/marcel/mkimg/mkimg.c Thu May 15 14:37:35 2014 (r266129)
@@ -218,13 +218,14 @@ parse_part(const char *spec)
#if defined(SPARSE_WRITE)
ssize_t
-sparse_write(int fd, const char *buf, size_t sz)
+sparse_write(int fd, const void *ptr, size_t sz)
{
- const char *p;
+ const char *buf, *p;
off_t ofs;
size_t len;
ssize_t wr, wrsz;
+ buf = ptr;
wrsz = 0;
p = memchr(buf, 0, sz);
while (sz > 0) {
Modified: user/marcel/mkimg/mkimg.h
==============================================================================
--- user/marcel/mkimg/mkimg.h Thu May 15 14:26:11 2014 (r266128)
+++ user/marcel/mkimg/mkimg.h Thu May 15 14:37:35 2014 (r266129)
@@ -68,7 +68,7 @@ round_block(lba_t n)
#if !defined(SPARSE_WRITE)
#define sparse_write write
#else
-ssize_t sparse_write(int, const char *, size_t);
+ssize_t sparse_write(int, const void *, size_t);
#endif
#endif /* _MKIMG_MKIMG_H_ */