Style nits.
This commit is contained in:
mycroft
parent
2896174213
commit
af65c82115
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660_node.c,v 1.4 1994/06/29 06:31:45 cgd Exp $ */
|
||||
/* $NetBSD: cd9660_node.c,v 1.5 1994/07/03 09:51:58 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986, 1989, 1994
|
||||
@ -59,7 +59,7 @@
|
||||
#if ((INOHSZ&(INOHSZ-1)) == 0)
|
||||
#define INOHASH(dev,ino) (((dev)+((ino)>>12))&(INOHSZ-1))
|
||||
#else
|
||||
#define INOHASH(dev,ino) (((unsigned)((dev)+((ino)>>12)))%INOHSZ)
|
||||
#define INOHASH(dev,ino) (((u_int)((dev)+((ino)>>12)))%INOHSZ)
|
||||
#endif
|
||||
|
||||
union iso_ihead {
|
||||
@ -72,7 +72,7 @@ union iso_ihead {
|
||||
#if ((DNOHSZ&(DNOHSZ-1)) == 0)
|
||||
#define DNOHASH(dev,ino) (((dev)+((ino)>>12))&(DNOHSZ-1))
|
||||
#else
|
||||
#define DNOHASH(dev,ino) (((unsigned)((dev)+((ino)>>12)))%DNOHSZ)
|
||||
#define DNOHASH(dev,ino) (((u_int)((dev)+((ino)>>12)))%DNOHSZ)
|
||||
#endif
|
||||
|
||||
union iso_dhead {
|
||||
@ -594,12 +594,12 @@ struct timeval *pu;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static unsigned
|
||||
static u_int
|
||||
cd9660_chars2ui(begin,len)
|
||||
unsigned char *begin;
|
||||
u_char *begin;
|
||||
int len;
|
||||
{
|
||||
unsigned rc;
|
||||
u_int rc;
|
||||
|
||||
for (rc = 0; --len >= 0;) {
|
||||
rc *= 10;
|
||||
@ -610,10 +610,10 @@ cd9660_chars2ui(begin,len)
|
||||
|
||||
int
|
||||
cd9660_tstamp_conv17(pi,pu)
|
||||
unsigned char *pi;
|
||||
u_char *pi;
|
||||
struct timeval *pu;
|
||||
{
|
||||
unsigned char buf[7];
|
||||
u_char buf[7];
|
||||
|
||||
/* year:"0001"-"9999" -> -1900 */
|
||||
buf[0] = cd9660_chars2ui(pi,4) - 1900;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660_rrip.c,v 1.4 1994/06/29 06:31:49 cgd Exp $ */
|
||||
/* $NetBSD: cd9660_rrip.c,v 1.5 1994/07/03 09:52:08 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993, 1994
|
||||
@ -313,7 +313,7 @@ cd9660_rrip_tstamp(p,ana)
|
||||
ISO_RRIP_TSTAMP *p;
|
||||
ISO_RRIP_ANALYZE *ana;
|
||||
{
|
||||
unsigned char *ptime;
|
||||
u_char *ptime;
|
||||
|
||||
ptime = p->time;
|
||||
|
||||
@ -381,7 +381,7 @@ cd9660_rrip_device(p,ana)
|
||||
ISO_RRIP_DEVICE *p;
|
||||
ISO_RRIP_ANALYZE *ana;
|
||||
{
|
||||
unsigned high, low;
|
||||
u_int high, low;
|
||||
|
||||
high = isonum_733(p->dev_t_high_l);
|
||||
low = isonum_733(p->dev_t_low_l);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660_rrip.h,v 1.3 1994/06/29 06:31:53 cgd Exp $ */
|
||||
/* $NetBSD: cd9660_rrip.h,v 1.4 1994/07/03 09:52:17 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1993, 1994
|
||||
@ -41,9 +41,9 @@
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
char type [ISODCL ( 0, 1)];
|
||||
unsigned char length [ISODCL ( 2, 2)]; /* 711 */
|
||||
unsigned char version [ISODCL ( 3, 3)];
|
||||
char type [ISODCL ( 0, 1)];
|
||||
u_char length [ISODCL ( 2, 2)]; /* 711 */
|
||||
u_char version [ISODCL ( 3, 3)];
|
||||
} ISO_SUSP_HEADER;
|
||||
|
||||
typedef struct {
|
||||
@ -117,13 +117,13 @@ typedef struct {
|
||||
|
||||
typedef struct {
|
||||
ISO_SUSP_HEADER h;
|
||||
unsigned char flags [ISODCL ( 4, 4)];
|
||||
unsigned char time [ISODCL ( 5, 5)];
|
||||
u_char flags [ISODCL ( 4, 4)];
|
||||
u_char time [ISODCL ( 5, 5)];
|
||||
} ISO_RRIP_TSTAMP;
|
||||
|
||||
typedef struct {
|
||||
ISO_SUSP_HEADER h;
|
||||
unsigned char flags [ISODCL ( 4, 4)];
|
||||
u_char flags [ISODCL ( 4, 4)];
|
||||
} ISO_RRIP_IDFLAG;
|
||||
|
||||
typedef struct {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660_util.c,v 1.4 1994/06/30 07:25:23 deraadt Exp $ */
|
||||
/* $NetBSD: cd9660_util.c,v 1.5 1994/07/03 09:52:21 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994
|
||||
@ -62,7 +62,7 @@
|
||||
#ifdef __notanymore__
|
||||
int
|
||||
isonum_711 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return (*p);
|
||||
}
|
||||
@ -76,7 +76,7 @@ signed char *p;
|
||||
|
||||
int
|
||||
isonum_721 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
/* little endian short */
|
||||
#if BYTE_ORDER != LITTLE_ENDIAN
|
||||
@ -88,7 +88,7 @@ unsigned char *p;
|
||||
|
||||
int
|
||||
isonum_722 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
/* big endian short */
|
||||
#if BYTE_ORDER != BIG_ENDIAN
|
||||
@ -100,7 +100,7 @@ unsigned char *p;
|
||||
|
||||
int
|
||||
isonum_723 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
return isonum_722 (p + 2);
|
||||
@ -114,7 +114,7 @@ unsigned char *p;
|
||||
|
||||
int
|
||||
isonum_731 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
/* little endian long */
|
||||
#if BYTE_ORDER != LITTLE_ENDIAN
|
||||
@ -126,7 +126,7 @@ unsigned char *p;
|
||||
|
||||
int
|
||||
isonum_732 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
/* big endian long */
|
||||
#if BYTE_ORDER != BIG_ENDIAN
|
||||
@ -138,7 +138,7 @@ unsigned char *p;
|
||||
|
||||
int
|
||||
isonum_733 (p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
#if BYTE_ORDER == BIG_ENDIAN
|
||||
return isonum_732 (p + 4);
|
||||
@ -157,10 +157,8 @@ unsigned char *p;
|
||||
*/
|
||||
int
|
||||
isofncmp(fn, fnlen, isofn, isolen)
|
||||
unsigned char *fn;
|
||||
int fnlen;
|
||||
unsigned char *isofn;
|
||||
int isolen;
|
||||
u_char *fn, *isofn;
|
||||
int fnlen, isolen;
|
||||
{
|
||||
int i, j;
|
||||
char c;
|
||||
@ -217,10 +215,9 @@ isofncmp(fn, fnlen, isofn, isolen)
|
||||
*/
|
||||
void
|
||||
isofntrans(infn, infnlen, outfn, outfnlen, original, assoc)
|
||||
unsigned char *infn;
|
||||
u_char *infn, *outfn;
|
||||
int infnlen;
|
||||
unsigned char *outfn;
|
||||
unsigned short *outfnlen;
|
||||
u_short *outfnlen;
|
||||
int original;
|
||||
int assoc;
|
||||
{
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: cd9660_vnops.c,v 1.4 1994/06/29 06:31:59 cgd Exp $ */
|
||||
/* $NetBSD: cd9660_vnops.c,v 1.5 1994/07/03 09:52:24 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994
|
||||
@ -289,7 +289,7 @@ cd9660_read(ap)
|
||||
do {
|
||||
lbn = iso_lblkno(imp, uio->uio_offset);
|
||||
on = iso_blkoff(imp, uio->uio_offset);
|
||||
n = min((unsigned)(imp->logical_block_size - on),
|
||||
n = min((u_int)(imp->logical_block_size - on),
|
||||
uio->uio_resid);
|
||||
diff = (off_t)ip->i_size - uio->uio_offset;
|
||||
if (diff <= 0)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: iso.h,v 1.3 1994/06/29 06:32:01 cgd Exp $ */
|
||||
/* $NetBSD: iso.h,v 1.4 1994/07/03 09:52:30 mycroft Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1994
|
||||
@ -96,8 +96,8 @@ struct iso_primary_descriptor {
|
||||
struct iso_directory_record {
|
||||
char length [ISODCL (1, 1)]; /* 711 */
|
||||
char ext_attr_length [ISODCL (2, 2)]; /* 711 */
|
||||
unsigned char extent [ISODCL (3, 10)]; /* 733 */
|
||||
unsigned char size [ISODCL (11, 18)]; /* 733 */
|
||||
u_char extent [ISODCL (3, 10)]; /* 733 */
|
||||
u_char size [ISODCL (11, 18)]; /* 733 */
|
||||
char date [ISODCL (19, 25)]; /* 7 by 711 */
|
||||
char flags [ISODCL (26, 26)];
|
||||
char file_unit_size [ISODCL (27, 27)]; /* 711 */
|
||||
@ -111,22 +111,22 @@ struct iso_directory_record {
|
||||
#define ISO_DIRECTORY_RECORD_SIZE 33
|
||||
|
||||
struct iso_extended_attributes {
|
||||
unsigned char owner [ISODCL (1, 4)]; /* 723 */
|
||||
unsigned char group [ISODCL (5, 8)]; /* 723 */
|
||||
unsigned char perm [ISODCL (9, 10)]; /* 9.5.3 */
|
||||
u_char owner [ISODCL (1, 4)]; /* 723 */
|
||||
u_char group [ISODCL (5, 8)]; /* 723 */
|
||||
u_char perm [ISODCL (9, 10)]; /* 9.5.3 */
|
||||
char ctime [ISODCL (11, 27)]; /* 8.4.26.1 */
|
||||
char mtime [ISODCL (28, 44)]; /* 8.4.26.1 */
|
||||
char xtime [ISODCL (45, 61)]; /* 8.4.26.1 */
|
||||
char ftime [ISODCL (62, 78)]; /* 8.4.26.1 */
|
||||
char recfmt [ISODCL (79, 79)]; /* 711 */
|
||||
char recattr [ISODCL (80, 80)]; /* 711 */
|
||||
unsigned char reclen [ISODCL (81, 84)]; /* 723 */
|
||||
u_char reclen [ISODCL (81, 84)]; /* 723 */
|
||||
char system_id [ISODCL (85, 116)]; /* achars */
|
||||
char system_use [ISODCL (117, 180)];
|
||||
char version [ISODCL (181, 181)]; /* 711 */
|
||||
char len_esc [ISODCL (182, 182)]; /* 711 */
|
||||
char reserved [ISODCL (183, 246)];
|
||||
unsigned char len_au [ISODCL (247, 250)]; /* 723 */
|
||||
u_char len_au [ISODCL (247, 250)]; /* 723 */
|
||||
};
|
||||
|
||||
/* CD-ROM Format type */
|
||||
@ -194,7 +194,7 @@ extern int (**cd9660_vnodeop_p)();
|
||||
|
||||
extern inline int
|
||||
isonum_711(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return *p;
|
||||
}
|
||||
@ -208,49 +208,48 @@ isonum_712(p)
|
||||
|
||||
extern inline int
|
||||
isonum_721(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return *p|((char)p[1] << 8);
|
||||
}
|
||||
|
||||
extern inline int
|
||||
isonum_722(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return ((char)*p << 8)|p[1];
|
||||
}
|
||||
|
||||
extern inline int
|
||||
isonum_723(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return isonum_721(p);
|
||||
}
|
||||
|
||||
extern inline int
|
||||
isonum_731(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return *p|(p[1] << 8)|(p[2] << 16)|(p[3] << 24);
|
||||
}
|
||||
|
||||
extern inline int
|
||||
isonum_732(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return (*p << 24)|(p[1] << 16)|(p[2] << 8)|p[3];
|
||||
}
|
||||
|
||||
extern inline int
|
||||
isonum_733(p)
|
||||
unsigned char *p;
|
||||
u_char *p;
|
||||
{
|
||||
return isonum_731(p);
|
||||
}
|
||||
|
||||
int isofncmp __P((unsigned char *, int, unsigned char *, int));
|
||||
void isofntrans __P((unsigned char *, int, unsigned char *, unsigned short *,
|
||||
int, int));
|
||||
int isofncmp __P((u_char *, int, u_char *, int));
|
||||
void isofntrans __P((u_char *, int, u_char *, u_short *, int, int));
|
||||
|
||||
/*
|
||||
* Associated files have a leading '='.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user