Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/archival/libarchive/unxz/xz.h

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/archival/libarchive/unxz/xz.h (modified) (5 diffs)

branches/3.3/mindi-busybox/archival/libarchive/unxz/xz.h

@@ -18 +18 @@
 #   include <stddef.h>
 #   include <stdint.h>
+#endif
+
+#ifdef __cplusplus
+extern "C" {
 #endif
 
@@ -71 +75 @@
  *                          is still possible in multi-call mode by simply
  *                          calling xz_dec_run() again.
- *                          NOTE: This return value is used only if
+ *                          Note that this return value is used only if
  *                          XZ_DEC_ANY_CHECK was defined at build time,
  *                          which is not used in the kernel. Unsupported
@@ -106 +110 @@
  *
  * In single-call mode, XZ_BUF_ERROR is returned only when the output buffer
- * is too small, or the compressed input is corrupt in a way that makes the
+ * is too small or the compressed input is corrupt in a way that makes the
  * decoder produce more output than the caller expected. When it is
  * (relatively) clear that the compressed input is truncated, XZ_DATA_ERROR
@@ -208 +212 @@
  * See enum xz_ret for details.
  *
- * NOTE: If an error occurs in single-call mode (return value is not
- * XZ_STREAM_END), b->in_pos and b->out_pos are not modified, and the
+ * Note that if an error occurs in single-call mode (return value is not
+ * XZ_STREAM_END), b->in_pos and b->out_pos are not modified and the
  * contents of the output buffer from b->out[b->out_pos] onward are
  * undefined. This is true even after XZ_BUF_ERROR, because with some filter
@@ -269 +273 @@
         const uint8_t *buf, size_t size, uint32_t crc);
 #endif
-#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif