Module Name: src
Committed By: reinoud
Date: Thu Aug 9 13:49:30 UTC 2018
Modified Files:
src/sys/fs/udf: ecma167-udf.h
Log Message:
Sync with UDFclient
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/fs/udf/ecma167-udf.h
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/udf/ecma167-udf.h
diff -u src/sys/fs/udf/ecma167-udf.h:1.15 src/sys/fs/udf/ecma167-udf.h:1.16
--- src/sys/fs/udf/ecma167-udf.h:1.15 Wed Jul 25 19:56:56 2018
+++ src/sys/fs/udf/ecma167-udf.h Thu Aug 9 13:49:30 2018
@@ -1,8 +1,8 @@
-/* $NetBSD: ecma167-udf.h,v 1.15 2018/07/25 19:56:56 kamil Exp $ */
+/* $NetBSD: ecma167-udf.h,v 1.16 2018/08/09 13:49:30 reinoud Exp $ */
/*-
- * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009
- * Reinoud Zandijk * <[email protected]>
+ * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009, 2017, 2018
+ * Reinoud Zandijk <[email protected]>
* Copyright (c) 2001, 2002 Scott Long <[email protected]>
* All rights reserved.
*
@@ -264,7 +264,10 @@ struct regid {
struct icb_tag {
uint32_t prev_num_dirs;
uint16_t strat_type;
- uint8_t strat_param[2];
+ union {
+ uint8_t strat_param[2];
+ uint16_t strat_param16;
+ };
uint16_t max_num_entries;
uint8_t reserved;
uint8_t file_type;
@@ -682,7 +685,10 @@ struct impl_extattr_entry {
struct extattr_entry hdr;
uint32_t iu_l;
struct regid imp_id;
- uint8_t data[1];
+ union {
+ uint8_t data[1];
+ uint16_t data16;
+ };
} __packed;
