Page MenuHomeFreeBSD
Files F157743491

D15628.id43172.diff
No OneTemporary
Actions

D15628.id43172.diff
View Options

Index: stand/common/boot.c
===================================================================
--- stand/common/boot.c
+++ stand/common/boot.c
@@ -36,6 +36,7 @@
#include "bootstrap.h"
+static int autoboot(int timeout, char *prompt);
static char *getbootfile(int try);
static int loadakernel(int try, int argc, char* argv[]);
@@ -157,7 +158,7 @@
autoboot(-1, NULL); /* try to boot automatically */
}
-int
+static int
autoboot(int timeout, char *prompt)
{
time_t when, otime, ntime;
Index: stand/common/bootstrap.h
===================================================================
--- stand/common/bootstrap.h
+++ stand/common/bootstrap.h
@@ -61,7 +61,6 @@
int parse(int *argc, char ***argv, const char *str);
/* boot.c */
-int autoboot(int timeout, char *prompt);
void autoboot_maybe(void);
int getrootmount(char *rootdev);
Index: stand/i386/gptboot/Makefile
===================================================================
--- stand/i386/gptboot/Makefile
+++ stand/i386/gptboot/Makefile
@@ -37,7 +37,7 @@
-Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline -Wno-pointer-sign
+ -Wno-pointer-sign
CFLAGS.gcc+= --param max-inline-insns-single=100
Index: stand/i386/gptzfsboot/Makefile
===================================================================
--- stand/i386/gptzfsboot/Makefile
+++ stand/i386/gptzfsboot/Makefile
@@ -37,7 +37,7 @@
-Wall -Waggregate-return -Wbad-function-cast \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
-Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline -Wno-pointer-sign
+ -Wno-pointer-sign
CFLAGS.clang+= -Wno-tentative-definition-incomplete-type
Index: stand/i386/zfsboot/Makefile
===================================================================
--- stand/i386/zfsboot/Makefile
+++ stand/i386/zfsboot/Makefile
@@ -34,8 +34,7 @@
-I${BOOTSRC}/i386/boot2 \
-Wall -Waggregate-return -Wbad-function-cast -Wno-cast-align \
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
- -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
- -Winline
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings
CFLAGS.gcc+= --param max-inline-insns-single=100
.if ${MACHINE} == "amd64"
Index: stand/libsa/cd9660read.c
===================================================================
--- stand/libsa/cd9660read.c
+++ stand/libsa/cd9660read.c
@@ -173,7 +173,7 @@
dirmatch(const char *path, struct iso_directory_record *dp, int use_rrip,
int lenskip)
{
- size_t len;
+ size_t len = 0;
const char *cp = NULL;
int i, icase;
Index: stand/userboot/userboot/main.c
===================================================================
--- stand/userboot/userboot/main.c
+++ stand/userboot/userboot/main.c
@@ -167,7 +167,7 @@
bzero(&zdev, sizeof(zdev));
zdev.dd.d_dev = &zfs_dev;
- dev = *(struct disk_devdesc *)&zdev;
+ memcpy(&dev, &zdev, sizeof(dev));
init_zfs_bootenv(zfs_fmtdev(&dev));
} else
#endif

File Metadata

Mime Type
text/plain
Expires
Mon, May 25, 6:22 PM (5 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33513416
Default Alt Text
D15628.id43172.diff (3 KB)

Event Timeline