This completely breaks sbin/fsdb ...
Warning: Object directory not changed from original /home/sbruno/bsd/head/sbin/fsdb cc -O2 -pipe -I/home/sbruno/bsd/head/sbin/fsdb/../fsck_ffs -std=gnu99 -Qunused-arguments -fstack-protector -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -Wno-pointer-sign -Wno-empty-body -Wno-string-plus-int -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-conversion -Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter -c fsdb.c fsdb.c:444:23: error: use of undeclared identifier 'cgrp'; did you mean 'cgp'? struct cg *cgp = &cgrp; ^~~~ cgp fsdb.c:444:16: note: 'cgp' declared here struct cg *cgp = &cgrp; ^ fsdb.c:444:16: error: incompatible pointer types initializing 'struct cg *' with an expression of type 'struct cg **'; remove & [-Werror,-Wincompatible-pointer-types] struct cg *cgp = &cgrp; ^ ~~~~~ fsdb.c:476:10: error: use of undeclared identifier 'cgblk' getblk(&cgblk, cgtod(&sblock, c), sblock.fs_cgsize); ^ fsdb.c:477:14: error: use of undeclared identifier 'cgblk' memcpy(cgp, cgblk.b_un.b_cg, sblock.fs_cgsize); ^ 4 errors generated. *** [fsdb.o] Error code 1 On Fri, 2013-03-22 at 21:50 +0000, Kirk McKusick wrote: > Modified: head/sbin/fsck_ffs/fsck.h > ============================================================================== > --- head/sbin/fsck_ffs/fsck.h Fri Mar 22 21:50:32 > 2013 (r248624) > +++ head/sbin/fsck_ffs/fsck.h Fri Mar 22 21:50:43 > 2013 (r248625) > @@ -198,7 +198,6 @@ struct timespec totalreadtime[BT_NUMBUFT > struct timespec startprog; > > struct bufarea sblk; /* file system superblock */ > -struct bufarea cgblk; /* cylinder group blocks */ > struct bufarea *pdirbp; /* current directory contents > */ > struct bufarea *pbp; /* current inode block */ > > @@ -216,9 +215,7 @@ struct bufarea *pbp; /* current > inode b > } while (0) > > #define sbdirty() dirty(&sblk) > -#define cgdirty() dirty(&cgblk) > #define sblock (*sblk.b_un.b_fs) > -#define cgrp (*cgblk.b_un.b_cg)
signature.asc
Description: This is a digitally signed message part