diff options
Diffstat (limited to 'src/mblock.c')
| -rw-r--r-- | src/mblock.c | 41 |
1 files changed, 5 insertions, 36 deletions
diff --git a/src/mblock.c b/src/mblock.c index 09566cd..d57acd7 100644 --- a/src/mblock.c +++ b/src/mblock.c @@ -2,7 +2,7 @@ This file is part of the lzop file compressor. - Copyright (C) 1996-2010 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2017 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. lzop and the LZO library are free software; you can redistribute them @@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Markus F.X.J. Oberhumer <markus@oberhumer.com> @@ -33,44 +33,16 @@ // **************************************************************************/ -static void do_init(mblock_p m, lzo_uint32 size, lzo_uint align) +static void do_init(mblock_p m, lzo_uint32 size, lzo_uint32 align) { memset(m,0,sizeof(*m)); m->mb_size = size; m->mb_align = (align > 1) ? align : 1; assert((m->mb_align & (m->mb_align - 1)) == 0); - m->mb_adler32 = ADLER32_INIT_VALUE; - m->mb_crc32 = CRC32_INIT_VALUE; } -#if 0 -lzo_bool mb_init(mblock_p m, lzo_uint32 size, lzo_uint align, - lzo_voidp heap, lzo_uint32 heap_size) -{ - do_init(m,size,align); - if (m->mb_size == 0) - return 1; - - if (heap == 0) - return 0; - m->mb_mem_alloc = (lzo_bytep) heap; - m->mb_size_alloc = heap_size; - assert(m->mb_size_alloc >= m->mb_size + m->mb_align - 1); - - m->mb_mem = LZO_PTR_ALIGN_UP(m->mb_mem_alloc,m->mb_align); - assert(m->mb_mem >= m->mb_mem_alloc); - assert(m->mb_mem + m->mb_size <= m->mb_mem_alloc + m->mb_size_alloc); -#if 0 - printf("m_init: %p %p %8ld %8ld %8ld\n", m->mb_mem_alloc, m->mb_mem, - (long) m->mb_size_alloc, (long) m->mb_size, (long) m->mb_align); -#endif - return 1; -} -#endif - - -lzo_bool mb_alloc(mblock_p m, lzo_uint32 size, lzo_uint align) +lzo_bool mb_alloc(mblock_p m, lzo_uint32 size, lzo_uint32 align) { do_init(m,size,align); if (m->mb_size == 0) @@ -100,7 +72,4 @@ void mb_free(mblock_p m) } -/* -vi:ts=4:et -*/ - +/* vim:set ts=4 sw=4 et: */ |