Module Name: src Committed By: tsutsui Date: Sun May 19 15:41:53 UTC 2024
Modified Files: src/sys/fs/cd9660: cd9660_extern.h cd9660_util.c Log Message: Make cd9660_util.c usable in userland tools like installboot(8). This was partially done for src/distrib/cdrom/macppc_installboot, but more strict prototypes are necessary for native binary builds. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/fs/cd9660/cd9660_extern.h cvs rdiff -u -r1.14 -r1.15 src/sys/fs/cd9660/cd9660_util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/fs/cd9660/cd9660_extern.h diff -u src/sys/fs/cd9660/cd9660_extern.h:1.28 src/sys/fs/cd9660/cd9660_extern.h:1.29 --- src/sys/fs/cd9660/cd9660_extern.h:1.28 Fri Feb 2 20:27:26 2024 +++ src/sys/fs/cd9660/cd9660_extern.h Sun May 19 15:41:53 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_extern.h,v 1.28 2024/02/02 20:27:26 christos Exp $ */ +/* $NetBSD: cd9660_extern.h,v 1.29 2024/05/19 15:41:53 tsutsui Exp $ */ /*- * Copyright (c) 1994 @@ -105,10 +105,11 @@ extern int (**cd9660_vnodeop_p)(void *); extern int (**cd9660_specop_p)(void *); extern int (**cd9660_fifoop_p)(void *); +ino_t isodirino(struct iso_directory_record *, struct iso_mnt *); +#endif /* _KERNEL */ + int isochar(const u_char *, const u_char *, int, u_int16_t *); int isofncmp(const u_char *, size_t, const u_char *, size_t, int); void isofntrans(const u_char *, int, u_char *, u_short *, int, int, int, int); -ino_t isodirino(struct iso_directory_record *, struct iso_mnt *); -#endif /* _KERNEL */ #endif /* _ISOFS_CD9660_CD9660_EXTERN_H_ */ Index: src/sys/fs/cd9660/cd9660_util.c diff -u src/sys/fs/cd9660/cd9660_util.c:1.14 src/sys/fs/cd9660/cd9660_util.c:1.15 --- src/sys/fs/cd9660/cd9660_util.c:1.14 Wed Mar 9 20:18:17 2016 +++ src/sys/fs/cd9660/cd9660_util.c Sun May 19 15:41:53 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_util.c,v 1.14 2016/03/09 20:18:17 christos Exp $ */ +/* $NetBSD: cd9660_util.c,v 1.15 2024/05/19 15:41:53 tsutsui Exp $ */ /*- * Copyright (c) 1994 @@ -38,7 +38,7 @@ #include <sys/cdefs.h> #ifdef _KERNEL -__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.14 2016/03/09 20:18:17 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_util.c,v 1.15 2024/05/19 15:41:53 tsutsui Exp $"); #else /* used by macppc_installboot */ #if HAVE_NBTOOL_CONFIG_H @@ -66,11 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: cd9660_util. #endif #include <fs/cd9660/iso.h> -#ifdef _KERNEL #include <fs/cd9660/cd9660_extern.h> -#else -static int isochar(const u_char *, const u_char *, int, uint16_t *); -#endif #include <fs/unicode.h>