svn commit: r298230 - in head: lib/libstand sys/boot/common sys/boot/efi/libefi sys/boot/efi/loader sys/boot/i386/libfirewire sys/boot/i386/libi386 sys/boot/i386/loader sys/boot/mips/beri/loader sy...

[Allan Jude]

On 2016-04-19 05:08, Bjoern A. Zeeb wrote:
> 
>> On 18 Apr 2016, at 23:09 , Allan Jude <allanjude at freebsd.org> wrote:
>>
>> Author: allanjude
>> Date: Mon Apr 18 23:09:22 2016
>> New Revision: 298230
>> URL: https://svnweb.freebsd.org/changeset/base/298230
>>
> 
> Can you have a look at this please?
> 
> ===> sys/boot/pc98/libpc98 (all)
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:132:5: warning: incompatible pointer types initializing 'int (*)(void *, int, daddr_t, size_t, size_t, char *, size_t *)' (aka 'int (*)(void *, int, long long, unsigned int, unsigned int
> , char *, unsigned int *)') with an expression of type 'int (void *, int, daddr_t, size_t, char *, size_t *)' (aka 'int (void *, int, long long, unsigned int, char *, unsigned int *)') [-Wincompatible-pointer-types]
>     bd_strategy,
>     ^~~~~~~~~~~
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:736:1: error: conflicting types for 'bd_strategy'
> bd_strategy(void *devdata, int rw, daddr_t dblk, size_t offset, size_t size,
> ^
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:120:12: note: previous declaration is here
> static int      bd_strategy(void *devdata, int flag, daddr_t dblk,
>                 ^
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:740:33: error: use of undeclared identifier 'f'
>     struct i386_devdesc         *dev = f->f_devdata;
>                                        ^
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:743:21: warning: incompatible pointer types assigning to 'int (*)(void *, int, daddr_t, size_t, size_t, char *, size_t *)' (aka 'int (*)(void *, int, long long, unsigned int, unsigned in
> t, char *, unsigned int *)') from 'int (void *, int, daddr_t, size_t, char *, size_t *)' (aka 'int (void *, int, long long, unsigned int, char *, unsigned int *)') [-Wincompatible-pointer-types]
>     bcd.dv_strategy = bd_realstrategy;
>                     ^ ~~~~~~~~~~~~~~~
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:747:13: error: too many arguments to function call, expected 7, have 8
>         size, buf, rsize));
>                    ^~~~~
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/../../common/bootstrap.h:79:1: note: 'bcache_strategy' declared here
> int     bcache_strategy(void *devdata, int rw, daddr_t blk, size_t offset,
> ^
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:751:1: error: conflicting types for 'bd_realstrategy'
> bd_realstrategy(void *devdata, int rw, daddr_t dblk, size_t offset,
> ^
> /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98/biosdisk.c:122:12: note: previous declaration is here
> static int      bd_realstrategy(void *devdata, int flag, daddr_t dblk,
>                 ^
> 2 warnings and 4 errors generated.
> --- biosdisk.o ---
> *** [biosdisk.o] Error code 1
> 
> bmake[8]: stopped in /scratch/tmp/bz/head.svn/sys/boot/pc98/libpc98
> ===> usr.sbin/cron/crontab (all)
> 
> — 
> Bjoern A. Zeeb                                  Charles Haddon Spurgeon:
> "Friendship is one of the sweetest joys of life.  Many might have failed
>  beneath the bitterness of their trial  had they not found a friend."
> 
> 

Fixed in r298275, sorry I missed that one

-- 
Allan Jude