git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dm: fix printk() rate limiting code
[pandora-kernel.git]
/
include
/
linux
/
lzo.h
diff --git
a/include/linux/lzo.h
b/include/linux/lzo.h
index
582d8b7
..
a0848d9
100644
(file)
--- a/
include/linux/lzo.h
+++ b/
include/linux/lzo.h
@@
-4,28
+4,28
@@
* LZO Public Kernel Interface
* A mini subset of the LZO real-time data compression library
*
* LZO Public Kernel Interface
* A mini subset of the LZO real-time data compression library
*
- * Copyright (C) 1996-20
05
Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ * Copyright (C) 1996-20
12
Markus F.X.J. Oberhumer <markus@oberhumer.com>
*
* The full LZO package can be found at:
* http://www.oberhumer.com/opensource/lzo/
*
*
* The full LZO package can be found at:
* http://www.oberhumer.com/opensource/lzo/
*
- * Changed for kernel use by:
+ * Changed for
Linux
kernel use by:
* Nitin Gupta <nitingupta910@gmail.com>
* Richard Purdie <rpurdie@openedhand.com>
*/
* Nitin Gupta <nitingupta910@gmail.com>
* Richard Purdie <rpurdie@openedhand.com>
*/
-#define LZO1X_
MEM_COMPRESS (16384 * sizeof(unsigned char *
))
-#define LZO1X_
1_MEM_COMPRESS LZO1X
_MEM_COMPRESS
+#define LZO1X_
1_MEM_COMPRESS (8192 * sizeof(unsigned short
))
+#define LZO1X_
MEM_COMPRESS LZO1X_1
_MEM_COMPRESS
-#define lzo1x_worst_compress(x) (
x + (x / 64) + 16
+ 3)
+#define lzo1x_worst_compress(x) (
(x) + ((x) / 16) + 64
+ 3)
-/* This requires 'w
o
rkmem' of size LZO1X_1_MEM_COMPRESS */
+/* This requires 'wrkmem' of size LZO1X_1_MEM_COMPRESS */
int lzo1x_1_compress(const unsigned char *src, size_t src_len,
int lzo1x_1_compress(const unsigned char *src, size_t src_len,
-
unsigned char *dst, size_t *dst_len, void *wrkmem);
+ unsigned char *dst, size_t *dst_len, void *wrkmem);
/* safe decompression with overrun testing */
int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
/* safe decompression with overrun testing */
int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
- unsigned char *dst, size_t *dst_len);
+
unsigned char *dst, size_t *dst_len);
/*
* Return values (< 0 = Error)
/*
* Return values (< 0 = Error)
@@
-40,5
+40,6
@@
int lzo1x_decompress_safe(const unsigned char *src, size_t src_len,
#define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8)
#define LZO_E_NOT_YET_IMPLEMENTED (-9)
#define LZO_E_EOF_NOT_FOUND (-7)
#define LZO_E_INPUT_NOT_CONSUMED (-8)
#define LZO_E_NOT_YET_IMPLEMENTED (-9)
+#define LZO_E_INVALID_ARGUMENT (-10)
#endif
#endif