From 27594eeae6f40a402bc3110f06d57975168e74e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 4 Jun 2015 19:20:15 +0200 Subject: ics-openvpn as a submodule! beautiful ics-openvpn is now officially on GitHub, and they track openssl and openvpn as submodules, so it's easier to update everything. Just a git submodule update --recursive. I've also set up soft links to native modules from ics-openvpn in app, so that we don't copy files in Gradle (which was causing problems with the submodules .git* files, not being copied). That makes the repo cleaner. --- app/lzo/src/lzo1b_xx.c | 86 -------------------------------------------------- 1 file changed, 86 deletions(-) delete mode 100644 app/lzo/src/lzo1b_xx.c (limited to 'app/lzo/src/lzo1b_xx.c') diff --git a/app/lzo/src/lzo1b_xx.c b/app/lzo/src/lzo1b_xx.c deleted file mode 100644 index 21eec0aa..00000000 --- a/app/lzo/src/lzo1b_xx.c +++ /dev/null @@ -1,86 +0,0 @@ -/* lzo1b_xx.c -- LZO1B compression public entry point - - This file is part of the LZO real-time data compression library. - - Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer - All Rights Reserved. - - The LZO library is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. - - The LZO library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with the LZO library; see the file COPYING. - If not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - Markus F.X.J. Oberhumer - - http://www.oberhumer.com/opensource/lzo/ - */ - - -#include "config1b.h" - - -/*********************************************************************** -// -************************************************************************/ - -static const lzo_compress_t * const c_funcs [9] = -{ - &_lzo1b_1_compress_func, - &_lzo1b_2_compress_func, - &_lzo1b_3_compress_func, - &_lzo1b_4_compress_func, - &_lzo1b_5_compress_func, - &_lzo1b_6_compress_func, - &_lzo1b_7_compress_func, - &_lzo1b_8_compress_func, - &_lzo1b_9_compress_func -}; - - -lzo_compress_t _lzo1b_get_compress_func(int clevel) -{ - const lzo_compress_t *f; - - if (clevel < LZO1B_BEST_SPEED || clevel > LZO1B_BEST_COMPRESSION) - { - if (clevel == LZO1B_DEFAULT_COMPRESSION) - clevel = LZO1B_BEST_SPEED; - else - return 0; - } - f = c_funcs[clevel-1]; - assert(f && *f); - return *f; -} - - -LZO_PUBLIC(int) -lzo1b_compress ( const lzo_bytep src, lzo_uint src_len, - lzo_bytep dst, lzo_uintp dst_len, - lzo_voidp wrkmem, - int clevel ) -{ - lzo_compress_t f; - - f = _lzo1b_get_compress_func(clevel); - if (!f) - return LZO_E_ERROR; - return _lzo1b_do_compress(src,src_len,dst,dst_len,wrkmem,f); -} - - - -/* -vi:ts=4:et -*/ - -- cgit v1.2.3