Date: Wed, 29 Mar 2017 20:49:41 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316177 - head/usr.sbin/makefs Message-ID: <201703292049.v2TKnfwg070702@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Wed Mar 29 20:49:41 2017 New Revision: 316177 URL: https://svnweb.freebsd.org/changeset/base/316177 Log: makefs: sync with NetBSD This is a collection of minor changes as diff reduction against NetBSD. NetBSD revs: cd9660.c 1.39 cd9660.h 1.19 makefs.c 1.34 Obtained from: NetBSD Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/makefs/cd9660.c head/usr.sbin/makefs/cd9660.h head/usr.sbin/makefs/makefs.c head/usr.sbin/makefs/makefs.h head/usr.sbin/makefs/walk.c Modified: head/usr.sbin/makefs/cd9660.c ============================================================================== --- head/usr.sbin/makefs/cd9660.c Wed Mar 29 19:58:00 2017 (r316176) +++ head/usr.sbin/makefs/cd9660.c Wed Mar 29 20:49:41 2017 (r316177) @@ -162,6 +162,7 @@ static cd9660node *cd9660_create_directo cd9660node *, cd9660node *); static cd9660node *cd9660_create_special_directory(iso9660_disk *, u_char, cd9660node *); +static int cd9660_add_generic_bootimage(iso9660_disk *, const char *); /* @@ -2159,7 +2160,7 @@ cd9660_create_special_directory(iso9660_ return temp; } -int +static int cd9660_add_generic_bootimage(iso9660_disk *diskStructure, const char *bootimage) { struct stat stbuf; Modified: head/usr.sbin/makefs/cd9660.h ============================================================================== --- head/usr.sbin/makefs/cd9660.h Wed Mar 29 19:58:00 2017 (r316176) +++ head/usr.sbin/makefs/cd9660.h Wed Mar 29 20:49:41 2017 (r316177) @@ -322,7 +322,6 @@ void cd9660_time_915(unsigned char *, /*** Boot Functions ***/ int cd9660_write_generic_bootimage(FILE *); -int cd9660_add_generic_bootimage(iso9660_disk *, const char *); int cd9660_write_boot(iso9660_disk *, FILE *); int cd9660_add_boot_disk(iso9660_disk *, const char *); int cd9660_eltorito_add_boot_option(iso9660_disk *, const char *, Modified: head/usr.sbin/makefs/makefs.c ============================================================================== --- head/usr.sbin/makefs/makefs.c Wed Mar 29 19:58:00 2017 (r316176) +++ head/usr.sbin/makefs/makefs.c Wed Mar 29 20:49:41 2017 (r316177) @@ -84,7 +84,6 @@ struct stat stampst; static fstype_t *get_fstype(const char *); static int get_tstamp(const char *, struct stat *); static void usage(fstype_t *, fsinfo_t *); -int main(int, char *[]); int main(int argc, char *argv[]) Modified: head/usr.sbin/makefs/makefs.h ============================================================================== --- head/usr.sbin/makefs/makefs.h Wed Mar 29 19:58:00 2017 (r316176) +++ head/usr.sbin/makefs/makefs.h Wed Mar 29 20:49:41 2017 (r316177) @@ -186,7 +186,7 @@ DECLARE_FUN(cd9660); extern u_int debug; extern int dupsok; extern struct timespec start_time; -extern struct stat stampst; +extern struct stat stampst; /* * If -x is specified, we want to exclude nodes which do not appear Modified: head/usr.sbin/makefs/walk.c ============================================================================== --- head/usr.sbin/makefs/walk.c Wed Mar 29 19:58:00 2017 (r316176) +++ head/usr.sbin/makefs/walk.c Wed Mar 29 20:49:41 2017 (r316177) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> +#include <sys/stat.h> #include <sys/time.h> #include <assert.h> @@ -50,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <sys/stat.h> #include "makefs.h" #include "mtree.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703292049.v2TKnfwg070702>