From owner-svn-src-all@freebsd.org Thu Feb 16 03:12:48 2017 Return-Path: Delivered-To: svn-src-all@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 5C814CE00D4; Thu, 16 Feb 2017 03:12:48 +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 2C2D110E; Thu, 16 Feb 2017 03:12:48 +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 v1G3Clt9085863; Thu, 16 Feb 2017 03:12:47 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1G3Cl5H085862; Thu, 16 Feb 2017 03:12:47 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201702160312.v1G3Cl5H085862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 16 Feb 2017 03:12:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r313787 - 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-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Feb 2017 03:12:48 -0000 Author: emaste Date: Thu Feb 16 03:12:47 2017 New Revision: 313787 URL: https://svnweb.freebsd.org/changeset/base/313787 Log: makefs: use a macro to simplify per-fs function declarations makefs.h 1.28 Obtained from: NetBSD Modified: head/usr.sbin/makefs/makefs.h Modified: head/usr.sbin/makefs/makefs.h ============================================================================== --- head/usr.sbin/makefs/makefs.h Thu Feb 16 01:44:56 2017 (r313786) +++ head/usr.sbin/makefs/makefs.h Thu Feb 16 03:12:47 2017 (r313787) @@ -158,16 +158,14 @@ int set_option(option_t *, const char * fsnode * walk_dir(const char *, const char *, fsnode *, fsnode *); void free_fsnodes(fsnode *); -void ffs_prep_opts(fsinfo_t *); -int ffs_parse_opts(const char *, fsinfo_t *); -void ffs_cleanup_opts(fsinfo_t *); -void ffs_makefs(const char *, const char *, fsnode *, fsinfo_t *); - -void cd9660_prep_opts(fsinfo_t *); -int cd9660_parse_opts(const char *, fsinfo_t *); -void cd9660_cleanup_opts(fsinfo_t *); -void cd9660_makefs(const char *, const char *, fsnode *, fsinfo_t *); +#define DECLARE_FUN(fs) \ +void fs ## _prep_opts(fsinfo_t *); \ +int fs ## _parse_opts(const char *, fsinfo_t *); \ +void fs ## _cleanup_opts(fsinfo_t *); \ +void fs ## _makefs(const char *, const char *, fsnode *, fsinfo_t *) +DECLARE_FUN(ffs); +DECLARE_FUN(cd9660); extern u_int debug; extern int dupsok;