Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update BriefLZ to 1.3.0 #250

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update BriefLZ to 1.3.0 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/brieflz/brieflz
Open in desktop
Submodule brieflz updated 29 files
+49 −11 .travis.yml
+154 −165 CMakeLists.txt
+1 −1 Doxyfile
+2 −3 LICENSE
+17 −4 NEWS
+69 −34 README.md
+17 −6 appveyor.yml
+0 −224 brieflz.c
+0 −121 depack.c
+0 −187 depacks.c
+8 −7 example/Makefile
+8 −7 example/Makefile.vc
+266 −98 example/blzpack.c
+123 −54 example/parg.c
+7 −7 example/parg.h
+41 −10 include/brieflz.h
+659 −0 src/brieflz.c
+11 −0 src/brieflz.pc.in
+332 −0 src/brieflz_btparse.h
+262 −0 src/brieflz_hashbucket.h
+221 −0 src/brieflz_hashchain.h
+192 −0 src/brieflz_lazy.h
+256 −0 src/brieflz_leparse.h
+261 −0 src/brieflz_sliding.h
+239 −0 src/brieflz_ssparse.h
+224 −0 src/depack.c
+310 −0 src/depacks.c
+440 −239 test/greatest.h
+116 −55 test/test_brieflz.c
37 changes: 29 additions & 8 deletions plugins/brieflz/squash-brieflz.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (c) 2015-2016 The Squash Authors
/* Copyright (c) 2015-2020 The Squash Authors
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
Expand Down Expand Up @@ -26,15 +26,33 @@
*/

#include <assert.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include <squash/squash.h>
#include <brieflz.h>

#include <stdio.h>
enum SquashBriefLZOptIndex {
SQUASH_BRIEFLZ_OPT_LEVEL = 0,
SQUASH_BRIEFLZ_OPT_OPTIMAL
};

static SquashOptionInfo squash_brieflz_options[] = {
{ "level",
SQUASH_OPTION_TYPE_RANGE_INT,
.info.range_int = {
.min = 1,
.max = 9 },
.default_value.int_value = 1 },
{ "optimal",
SQUASH_OPTION_TYPE_BOOL,
.default_value.bool_value = false },
{ NULL, SQUASH_OPTION_TYPE_NONE, }
};


SQUASH_PLUGIN_EXPORT
SquashStatus squash_plugin_init_codec (SquashCodec* codec, SquashCodecImpl* impl);
Expand Down Expand Up @@ -98,6 +116,8 @@ squash_brieflz_compress_buffer (SquashCodec* codec,
uint8_t *dst = compressed;
void *workmem = NULL;
unsigned long size;
int level = squash_options_get_bool_at (options, codec, SQUASH_BRIEFLZ_OPT_OPTIMAL) ? 10
: squash_options_get_int_at (options, codec, SQUASH_BRIEFLZ_OPT_LEVEL);

#if ULONG_MAX < SIZE_MAX
if (HEDLEY_UNLIKELY(ULONG_MAX < uncompressed_size) ||
Expand All @@ -110,15 +130,15 @@ squash_brieflz_compress_buffer (SquashCodec* codec,
return squash_error (SQUASH_BUFFER_FULL);
}

workmem = squash_malloc (blz_workmem_size ((unsigned long) uncompressed_size));
workmem = squash_malloc (blz_workmem_size_level ((unsigned long) uncompressed_size, level));

if (HEDLEY_UNLIKELY(workmem == NULL)) {
return squash_error (SQUASH_MEMORY);
}

size = blz_pack (uncompressed, dst,
(unsigned long) uncompressed_size,
workmem);
size = blz_pack_level (uncompressed, dst,
(unsigned long) uncompressed_size,
workmem, level);

squash_free (workmem);

Expand All @@ -137,6 +157,7 @@ squash_plugin_init_codec (SquashCodec* codec, SquashCodecImpl* impl) {
const char* name = squash_codec_get_name (codec);

if (HEDLEY_LIKELY(strcmp ("brieflz", name) == 0)) {
impl->options = squash_brieflz_options;
impl->info = SQUASH_CODEC_INFO_WRAP_SIZE;
/* impl->get_uncompressed_size = squash_brieflz_get_uncompressed_size; */
impl->get_max_compressed_size = squash_brieflz_get_max_compressed_size;
Expand Down