Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanups suggested by simonb: 

- rename "format.c" -> "pack_dev.c", "mknod.h" -> "pack_dev.h"
- make the private stuff in pack_dev.c static
This commit is contained in:
lukem 2001-10-08 04:45:29 +00:00
parent da188f40f2
commit 7ca2a2b569
4 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/mknod/Makefile
View File

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.8 2001/10/08 04:20:43 lukem Exp $
# $NetBSD: Makefile,v 1.9 2001/10/08 04:45:29 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
PROG= mknod
SRCS= mknod.c format.c
SRCS= mknod.c pack_dev.c
MAN= mknod.8
WARNS?= 2

8
sbin/mknod/mknod.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mknod.c,v 1.23 2001/10/08 04:25:00 lukem Exp $ */
/* $NetBSD: mknod.c,v 1.24 2001/10/08 04:45:29 lukem Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -39,7 +39,7 @@
#include <sys/cdefs.h>
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.\n");
__RCSID("$NetBSD: mknod.c,v 1.23 2001/10/08 04:25:00 lukem Exp $");
__RCSID("$NetBSD: mknod.c,v 1.24 2001/10/08 04:45:29 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -53,7 +53,7 @@ __RCSID("$NetBSD: mknod.c,v 1.23 2001/10/08 04:25:00 lukem Exp $");
#include <unistd.h>
#include <string.h>
#include "mknod.h"
#include "pack_dev.h"
int main(int, char *[]);
static void usage(void);
@ -78,7 +78,7 @@ main(int argc, char **argv)
while ((ch = getopt(argc, argv, "F:")) != -1) {
switch (ch) {
case 'F':
pack = find_format(optarg);
pack = pack_find(optarg);
if (pack == NULL)
errx(1, "invalid format: %s", optarg);
hasformat++;

53
sbin/mknod/format.c → sbin/mknod/pack_dev.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: format.c,v 1.1 2001/10/08 04:20:44 lukem Exp $ */
/* $NetBSD: pack_dev.c,v 1.1 2001/10/08 04:45:30 lukem Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: format.c,v 1.1 2001/10/08 04:20:44 lukem Exp $");
__RCSID("$NetBSD: pack_dev.c,v 1.1 2001/10/08 04:45:30 lukem Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -51,8 +51,19 @@ __RCSID("$NetBSD: format.c,v 1.1 2001/10/08 04:20:44 lukem Exp $");
#include <unistd.h>
#include <string.h>
#include "mknod.h"
#include "pack_dev.h"
static pack_t pack_netbsd;
static pack_t pack_freebsd;
static pack_t pack_8_8;
static pack_t pack_12_20;
static pack_t pack_14_18;
static pack_t pack_8_24;
static pack_t pack_bsdos;
static int compare_format(const void *, const void *);
/* exported */
dev_t
pack_native(int n, u_long numbers[])
{
@ -77,9 +88,7 @@ pack_native(int n, u_long numbers[])
(((y) << 12) & 0xfff00000) | \
(((y) << 0) & 0x000000ff)))
pack_t pack_netbsd;
dev_t
static dev_t
pack_netbsd(int n, u_long numbers[])
{
dev_t dev;
@ -101,9 +110,7 @@ pack_netbsd(int n, u_long numbers[])
#define makedev_freebsd(x,y) ((dev_t)((((x) << 8) & 0x0000ff00) | \
(((y) << 0) & 0xffff00ff)))
pack_t pack_freebsd;
dev_t
static dev_t
pack_freebsd(int n, u_long numbers[])
{
dev_t dev;
@ -125,9 +132,7 @@ pack_freebsd(int n, u_long numbers[])
#define makedev_8_8(x,y) ((dev_t)((((x) << 8) & 0x0000ff00) | \
(((y) << 0) & 0x000000ff)))
pack_t pack_8_8;
dev_t
static dev_t
pack_8_8(int n, u_long numbers[])
{
dev_t dev;
@ -149,9 +154,7 @@ pack_8_8(int n, u_long numbers[])
#define makedev_12_20(x,y) ((dev_t)((((x) << 20) & 0xfff00000) | \
(((y) << 0) & 0x000fffff)))
pack_t pack_12_20;
dev_t
static dev_t
pack_12_20(int n, u_long numbers[])
{
dev_t dev;
@ -173,9 +176,7 @@ pack_12_20(int n, u_long numbers[])
#define makedev_14_18(x,y) ((dev_t)((((x) << 18) & 0xfffc0000) | \
(((y) << 0) & 0x0003ffff)))
pack_t pack_14_18;
dev_t
static dev_t
pack_14_18(int n, u_long numbers[])
{
dev_t dev;
@ -197,9 +198,7 @@ pack_14_18(int n, u_long numbers[])
#define makedev_8_24(x,y) ((dev_t)((((x) << 24) & 0xff000000) | \
(((y) << 0) & 0x00ffffff)))
pack_t pack_8_24;
dev_t
static dev_t
pack_8_24(int n, u_long numbers[])
{
dev_t dev;
@ -223,9 +222,7 @@ pack_8_24(int n, u_long numbers[])
(((y) << 8) & 0x000fff00) | \
(((z) << 0) & 0x000000ff)))
pack_t pack_bsdos;
dev_t
static dev_t
pack_bsdos(int n, u_long numbers[])
{
dev_t dev;
@ -250,6 +247,8 @@ pack_bsdos(int n, u_long numbers[])
}
/* list of formats and pack functions */
/* this list must be sorted lexically */
struct format {
const char *name;
pack_t *pack;
@ -272,9 +271,7 @@ struct format {
{"ultrix", pack_8_8},
};
int compare_format(const void *, const void *);
int
static int
compare_format(const void *key, const void *element)
{
const char *name;
@ -288,7 +285,7 @@ compare_format(const void *key, const void *element)
pack_t *
find_format(const char *name)
pack_find(const char *name)
{
struct format *format;

10
sbin/mknod/mknod.h → sbin/mknod/pack_dev.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: mknod.h,v 1.1 2001/10/08 04:20:44 lukem Exp $ */
/* $NetBSD: pack_dev.h,v 1.1 2001/10/08 04:45:30 lukem Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@ -36,12 +36,12 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef _MKNOD_H
#define _MKNOD_H
#ifndef _PACK_DEV_H
#define _PACK_DEV_H
typedef dev_t pack_t(int, u_long []);
pack_t *find_format(const char *);
pack_t *pack_find(const char *);
pack_t pack_native;
#endif /* _MKNOD_H */
#endif /* _PACK_DEV_H */