Attachment 149223 Details for Bug 194911 – patch to build libarchive and bsdtar from 10.1 on 8.4

[patch] patch to build libarchive and bsdtar from 10.1 on 8.4

libarchive.diff (text/plain), 1.68 KB, created by Olli Hauer on 2014-11-09 17:13:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olli Hauer

Created: 2014-11-09 17:13:44 UTC

Size: 1.68 KB

patch

obsolete

>Index: contrib/libarchive/libarchive/archive_read_support_format_cab.c
>===================================================================
>--- contrib/libarchive/libarchive/archive_read_support_format_cab.c	(revision 274303)
>+++ contrib/libarchive/libarchive/archive_read_support_format_cab.c	(working copy)
>@@ -2759,7 +2759,7 @@
> 	int at_max_bits = at->max_bits;
> 	int lt_max_bits = lt->max_bits;
> 	int mt_max_bits = mt->max_bits;
>-	int c, copy_len = ds->copy_len, copy_pos = ds->copy_pos;
>+	int copy_len = ds->copy_len, copy_pos = ds->copy_pos;
> 	int w_pos = ds->w_pos, w_mask = ds->w_mask, w_size = ds->w_size;
> 	int length_header = ds->length_header;
> 	int offset_bits = ds->offset_bits;
>@@ -2767,6 +2767,7 @@
> 	int r0 = ds->r0, r1 = ds->r1, r2 = ds->r2;
> 	int state = ds->state;
> 	char block_type = ds->block_type;
>+	unsigned int c = 0;
> 
> 	for (;;) {
> 		switch (state) {
>Index: contrib/libarchive/libarchive/archive_read_support_format_lha.c
>===================================================================
>--- contrib/libarchive/libarchive/archive_read_support_format_lha.c	(revision 274303)
>+++ contrib/libarchive/libarchive/archive_read_support_format_lha.c	(working copy)
>@@ -2283,11 +2283,12 @@
> 	unsigned char *w_buff = ds->w_buff;
> 	unsigned char *lt_bitlen = lt->bitlen;
> 	unsigned char *pt_bitlen = pt->bitlen;
>-	int blocks_avail = ds->blocks_avail, c = 0;
>+	int blocks_avail = ds->blocks_avail;
> 	int copy_len = ds->copy_len, copy_pos = ds->copy_pos;
> 	int w_pos = ds->w_pos, w_mask = ds->w_mask, w_size = ds->w_size;
> 	int lt_max_bits = lt->max_bits, pt_max_bits = pt->max_bits;
> 	int state = ds->state;
>+	unsigned int c = 0;
> 
> 	if (ds->w_remaining > 0) {
> 		if (!lzh_copy_from_window(strm, ds))

Actions: View | Diff

Attachments on bug 194911: 149223