diff options
author | marius <marius@FreeBSD.org> | 2013-07-28 12:29:10 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2013-07-28 12:29:10 +0000 |
commit | 335ec6e6b3b17a26c9570d985fee217a17b18d0c (patch) | |
tree | 0c1c10128cb6388e8b42736b444c7a38cfe2105a /sys/fs | |
parent | 6660649d5cef4f23ef970e0df3195a939b46cbb3 (diff) | |
download | FreeBSD-src-335ec6e6b3b17a26c9570d985fee217a17b18d0c.zip FreeBSD-src-335ec6e6b3b17a26c9570d985fee217a17b18d0c.tar.gz |
- Add const-qualifiers to the arguments of isonum_*().
- According to ISO 9660 7.1.2, isonum_712() should return a signed value.
- Try to get isonum_*() closer to style(9).
Diffstat (limited to 'sys/fs')
-rw-r--r-- | sys/fs/cd9660/iso.h | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index 89322e7..a831d7b8 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -291,56 +291,65 @@ u_short sgetrune(const char *, size_t, char const **, int, void *); */ static __inline uint8_t -isonum_711(unsigned char *p) +isonum_711(const unsigned char *p) { - return p[0]; + + return (p[0]); } -static __inline uint8_t -isonum_712(unsigned char *p) +static __inline int8_t +isonum_712(const unsigned char *p) { - return p[0]; + + return ((signed char)p[0]); } static __inline uint8_t -isonum_713(unsigned char *p) +isonum_713(const unsigned char *p) { - return p[0]; + + return (p[0]); } static __inline uint16_t -isonum_721(unsigned char *p) +isonum_721(const unsigned char *p) { + return (p[0] | p[1] << 8); } static __inline uint16_t -isonum_722(unsigned char *p) +isonum_722(const unsigned char *p) { + return (p[1] | p[0] << 8); } static __inline uint16_t -isonum_723(unsigned char *p) +isonum_723(const unsigned char *p) { + return (p[0] | p[1] << 8); } static __inline uint32_t -isonum_731(unsigned char *p) +isonum_731(const unsigned char *p) { + return (p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24); } static __inline uint32_t -isonum_732(unsigned char *p) +isonum_732(const unsigned char *p) { + return (p[3] | p[2] << 8 | p[1] << 16 | p[0] << 24); } static __inline uint32_t -isonum_733(unsigned char *p) +isonum_733(const unsigned char *p) { + return (p[0] | p[1] << 8 | p[2] << 16 | p[3] << 24); } |