38 lines
838 B
Diff
38 lines
838 B
Diff
--- ./libcdio-0.92/include/cdio/bytesex.h 2018-06-05 18:05:16.183586450 +0200
|
||
+++ ../libcdio-fedora/libcdio-0.94/include/cdio/bytesex.h 2015-05-09 00:27:50.000000000 +0200
|
||
@@ -197,19 +197,31 @@
|
||
}
|
||
|
||
/** Convert from ISO 9660 7.3.3 format to uint32_t */
|
||
-static CDIO_INLINE uint32_t
|
||
+static CDIO_INLINE uint32_t
|
||
from_733 (uint64_t p)
|
||
{
|
||
if (uint64_swap_le_be (p) != p)
|
||
cdio_warn ("from_733: broken byte order");
|
||
-
|
||
+
|
||
+ return (UINT32_C(0xFFFFFFFF) & p);
|
||
+}
|
||
+
|
||
+static CDIO_INLINE uint32_t
|
||
+from_733_with_err (uint64_t p, bool *err)
|
||
+{
|
||
+ if (uint64_swap_le_be (p) != p) {
|
||
+ cdio_warn ("from_733: broken byte order");
|
||
+ *err = true;
|
||
+ } else {
|
||
+ *err = false;
|
||
+ }
|
||
return (UINT32_C(0xFFFFFFFF) & p);
|
||
}
|
||
|
||
#endif /* CDIO_BYTESEX_H_ */
|
||
|
||
|
||
-/*
|
||
+/*
|
||
* Local variables:
|
||
* c-file-style: "gnu"
|
||
* tab-width: 8
|