KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tools/mtd-utils: cleanup mkubifs lzo patch

Browse source 
SVN-Revision: 30770
This commit is contained in:
Gabor Juhos 2012-03-01 19:55:49 +00:00
parent 3698c6a391
commit 8e0af8361d
1 changed files with 55 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

114
tools/mtd-utils/patches/135-mkubifs_optional_lzo.patch
View file

@ -1,108 +1,102 @@
--- a/mkfs.ubifs/compr.c --- a/mkfs.ubifs/compr.c
+++ b/mkfs.ubifs/compr.c +++ b/mkfs.ubifs/compr.c
@@ -24,7 +24,9 @@ @@ -24,7 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
+#ifndef WITHOUT_LZO -#include <lzo/lzo1x.h>
#include <lzo/lzo1x.h>
+#endif
#include <linux/types.h> #include <linux/types.h>
#define crc32 __zlib_crc32 #define crc32 __zlib_crc32
@@ -35,7 +37,9 @@ @@ -35,7 +34,6 @@
#include "ubifs-media.h" #include "ubifs-media.h"
#include "mkfs.ubifs.h" #include "mkfs.ubifs.h"
+#ifndef WITHOUT_LZO -static void *lzo_mem;
static void *lzo_mem;
+#endif
static unsigned long long errcnt = 0; static unsigned long long errcnt = 0;
static struct ubifs_info *c = &info_; static struct ubifs_info *c = &info_;
@@ -86,6 +90,7 @@ static int zlib_deflate(void *in_buf, si @@ -86,6 +84,25 @@ static int zlib_deflate(void *in_buf, si
return 0; return 0;
} }
+#ifndef WITHOUT_LZO +#ifndef WITHOUT_LZO
+#include <lzo/lzo1x.h>
+
+static void *lzo_mem;
+
+static int lzo_init(void)
+{
+ lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
+ if (!lzo_mem)
+ return -1;
+
+ return 0;
+}
+
+static void lzo_fini(void)
+{
+ free(lzo_mem);
+}
+
static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
size_t *out_len) size_t *out_len)
{ {
@@ -103,6 +108,7 @@ static int lzo_compress(void *in_buf, si @@ -103,6 +120,12 @@ static int lzo_compress(void *in_buf, si
return 0; return 0;
} }
+#else
+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+ size_t *out_len) { return -1; }
+static inline int lzo_init(void) { return 0; }
+static inline void lzo_fini(void) { }
+#endif +#endif
static int no_compress(void *in_buf, size_t in_len, void *out_buf, static int no_compress(void *in_buf, size_t in_len, void *out_buf,
size_t *out_len) size_t *out_len)
@@ -120,14 +126,20 @@ static int favor_lzo_compress(void *in_b @@ -123,7 +146,6 @@ static int favor_lzo_compress(void *in_b
int lzo_ret, zlib_ret;
size_t lzo_len, zlib_len;
+#ifndef WITHOUT_LZO
lzo_len = zlib_len = *out_len; lzo_len = zlib_len = *out_len;
lzo_ret = lzo_compress(in_buf, in_len, out_buf, &lzo_len); lzo_ret = lzo_compress(in_buf, in_len, out_buf, &lzo_len);
+#endif
zlib_ret = zlib_deflate(in_buf, in_len, zlib_buf, &zlib_len); zlib_ret = zlib_deflate(in_buf, in_len, zlib_buf, &zlib_len);
- -
+#ifndef WITHOUT_LZO
if (lzo_ret && zlib_ret) if (lzo_ret && zlib_ret)
+#else
+ if (zlib_ret)
+#endif
/* Both compressors failed */ /* Both compressors failed */
return -1; return -1;
@@ -198,23 +220,28 @@ int compress_data(void *in_buf, size_t i
+#ifndef WITHOUT_LZO
if (!lzo_ret && !zlib_ret) {
double percent;
@@ -152,6 +164,7 @@ select_lzo:
*out_len = lzo_len;
*type = MKFS_UBIFS_COMPR_LZO;
return 0;
+#endif
select_zlib:
*out_len = zlib_len;
@@ -174,9 +187,11 @@ int compress_data(void *in_buf, size_t i
ret = favor_lzo_compress(in_buf, in_len, out_buf, out_len, &type);
else {
switch (type) {
+#ifndef WITHOUT_LZO
case MKFS_UBIFS_COMPR_LZO:
ret = lzo_compress(in_buf, in_len, out_buf, out_len);
break;
+#endif
case MKFS_UBIFS_COMPR_ZLIB:
ret = zlib_deflate(in_buf, in_len, out_buf, out_len);
break;
@@ -198,13 +213,17 @@ int compress_data(void *in_buf, size_t i
int init_compression(void) int init_compression(void)
{ {
+#ifndef WITHOUT_LZO - lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
lzo_mem = malloc(LZO1X_999_MEM_COMPRESS); - if (!lzo_mem)
if (!lzo_mem) - return -1;
return -1; + int ret;
+#endif +
+ ret = lzo_init();
+ if (ret)
+ goto err;
zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
if (!zlib_buf) { - if (!zlib_buf) {
+#ifndef WITHOUT_LZO - free(lzo_mem);
free(lzo_mem); - return -1;
+#endif - }
return -1; + if (!zlib_buf)
+ goto err_lzo;
return 0;
+
+err_lzo:
+ lzo_fini();
+err:
+ return ret;
} }
@@ -214,7 +233,9 @@ int init_compression(void)
void destroy_compression(void) void destroy_compression(void)
{ {
free(zlib_buf); free(zlib_buf);
+#ifndef WITHOUT_LZO - free(lzo_mem);
free(lzo_mem); + lzo_fini();
+#endif
if (errcnt) if (errcnt)
fprintf(stderr, "%llu compression errors occurred\n", errcnt); fprintf(stderr, "%llu compression errors occurred\n", errcnt);
} }