From owner-svn-src-head@freebsd.org Wed Mar 29 20:49:43 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0885ED24F8C; Wed, 29 Mar 2017 20:49:43 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 D76C21E57; Wed, 29 Mar 2017 20:49:42 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2TKnfsD070708; Wed, 29 Mar 2017 20:49:41 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2TKnfwg070702; Wed, 29 Mar 2017 20:49:41 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201703292049.v2TKnfwg070702@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Wed, 29 Mar 2017 20:49:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316177 - head/usr.sbin/makefs X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Mar 2017 20:49:43 -0000 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 +#include #include #include @@ -50,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include "makefs.h" #include "mtree.h"