Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/fs/cd9660/cd9660_rrip.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/fs/cd9660/cd9660_rrip.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.14 retrieving revision 1.14.18.2 diff -u -p -r1.14 -r1.14.18.2 --- src/sys/fs/cd9660/cd9660_rrip.c 2007/10/08 18:04:02 1.14 +++ src/sys/fs/cd9660/cd9660_rrip.c 2008/06/02 13:24:04 1.14.18.2 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_rrip.c,v 1.14 2007/10/08 18:04:02 ad Exp $ */ +/* $NetBSD: cd9660_rrip.c,v 1.14.18.2 2008/06/02 13:24:04 mjf Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.14 2007/10/08 18:04:02 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd9660_rrip.c,v 1.14.18.2 2008/06/02 13:24:04 mjf Exp $"); #include #include @@ -85,9 +85,7 @@ static int cd9660_rrip_loop(struct iso_d * POSIX file attribute */ static int -cd9660_rrip_attr(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_attr(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_ATTR *p = v; @@ -100,9 +98,7 @@ cd9660_rrip_attr(v, ana) } static void -cd9660_rrip_defattr(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_defattr(void *v, ISO_RRIP_ANALYZE *ana) { struct iso_directory_record *isodir = v; @@ -115,9 +111,7 @@ cd9660_rrip_defattr(v, ana) * Symbolic Links */ static int -cd9660_rrip_slink(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_slink(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_SLINK *p = v; ISO_RRIP_SLINK_COMPONENT *pcomp; @@ -228,9 +222,7 @@ cd9660_rrip_slink(v, ana) * Alternate name */ static int -cd9660_rrip_altname(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_altname(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_ALTNAME *p = v; const char *inbuf; @@ -292,9 +284,7 @@ cd9660_rrip_altname(v, ana) } static void -cd9660_rrip_defname(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_defname(void *v, ISO_RRIP_ANALYZE *ana) { struct iso_directory_record *isodir = v; @@ -320,9 +310,7 @@ cd9660_rrip_defname(v, ana) * Parent or Child Link */ static int -cd9660_rrip_pclink(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_pclink(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_CLINK *p = v; @@ -346,9 +334,7 @@ cd9660_rrip_reldir(void *v, ISO_RRIP_ANA } static int -cd9660_rrip_tstamp(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_tstamp(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_TSTAMP *p = v; u_char *ptime; @@ -404,9 +390,7 @@ cd9660_rrip_tstamp(v, ana) } static void -cd9660_rrip_deftstamp(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_deftstamp(void *v, ISO_RRIP_ANALYZE *ana) { struct iso_directory_record *isodir = v; @@ -417,9 +401,7 @@ cd9660_rrip_deftstamp(v, ana) * POSIX device modes */ static int -cd9660_rrip_device(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_device(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_DEVICE *p = v; u_int high, low; @@ -439,9 +421,7 @@ cd9660_rrip_device(v, ana) * Flag indicating */ static int -cd9660_rrip_idflag(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_idflag(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_IDFLAG *p = v; @@ -457,9 +437,7 @@ cd9660_rrip_idflag(v, ana) * Continuation pointer */ static int -cd9660_rrip_cont(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_cont(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_CONT *p = v; @@ -482,9 +460,7 @@ cd9660_rrip_stop(void *v, ISO_RRIP_ANALY * Extension reference */ static int -cd9660_rrip_extref(v, ana) - void *v; - ISO_RRIP_ANALYZE *ana; +cd9660_rrip_extref(void *v, ISO_RRIP_ANALYZE *ana) { ISO_RRIP_EXTREF *p = v; @@ -506,10 +482,8 @@ cd9660_rrip_extref(v, ana) static int -cd9660_rrip_loop(isodir, ana, table) - struct iso_directory_record *isodir; - ISO_RRIP_ANALYZE *ana; - const RRIP_TABLE *table; +cd9660_rrip_loop(struct iso_directory_record *isodir, ISO_RRIP_ANALYZE *ana, + const RRIP_TABLE *table) { const RRIP_TABLE *ptable; ISO_SUSP_HEADER *phead; @@ -574,7 +548,8 @@ cd9660_rrip_loop(isodir, ana, table) || ana->iso_ce_off + ana->iso_ce_len > ana->imp->logical_block_size || bread(ana->imp->im_devvp, ana->iso_ce_blk << (ana->imp->im_bshift - DEV_BSHIFT), - ana->imp->logical_block_size, NOCRED, &bp)) + ana->imp->logical_block_size, NOCRED, + 0, &bp)) /* what to do now? */ break; phead = (ISO_SUSP_HEADER *)((char *)bp->b_data + ana->iso_ce_off); @@ -609,10 +584,8 @@ static const RRIP_TABLE rrip_table_analy }; int -cd9660_rrip_analyze(isodir, inop, imp) - struct iso_directory_record *isodir; - struct iso_node *inop; - struct iso_mnt *imp; +cd9660_rrip_analyze(struct iso_directory_record *isodir, struct iso_node *inop, + struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; @@ -638,12 +611,8 @@ static const RRIP_TABLE rrip_table_getna }; int -cd9660_rrip_getname(isodir, outbuf, outlen, inump, imp) - struct iso_directory_record *isodir; - char *outbuf; - u_short *outlen; - ino_t *inump; - struct iso_mnt *imp; +cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf, + u_short *outlen, ino_t *inump, struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; const RRIP_TABLE *tab; @@ -682,11 +651,8 @@ static const RRIP_TABLE rrip_table_getsy }; int -cd9660_rrip_getsymname(isodir, outbuf, outlen, imp) - struct iso_directory_record *isodir; - char *outbuf; - u_short *outlen; - struct iso_mnt *imp; +cd9660_rrip_getsymname(struct iso_directory_record *isodir, char *outbuf, + u_short *outlen, struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; @@ -713,9 +679,7 @@ static const RRIP_TABLE rrip_table_extre * Note: We insist on the ER field. */ int -cd9660_rrip_offset(isodir, imp) - struct iso_directory_record *isodir; - struct iso_mnt *imp; +cd9660_rrip_offset(struct iso_directory_record *isodir, struct iso_mnt *imp) { ISO_RRIP_OFFSET *p; ISO_RRIP_ANALYZE analyze;