Merging upstream version 1.2~pre1.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
55c26d29ff
commit
c229ba10a7
20 changed files with 280 additions and 243 deletions
|
@ -1,6 +1,6 @@
|
|||
/* Plzip - Parallel compressor compatible with lzip
|
||||
Copyright (C) 2009 Laszlo Ersek.
|
||||
Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
|
||||
Copyright (C) 2009, 2010, 2011, 2012, 2013, 2014 Antonio Diaz Diaz.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
|
@ -248,7 +248,7 @@ public:
|
|||
// collect a packet from a worker
|
||||
void collect_packet( const Packet * const opacket )
|
||||
{
|
||||
const int i = opacket->id%num_slots;
|
||||
const int i = opacket->id % num_slots;
|
||||
xlock( &omutex );
|
||||
// id collision shouldn't happen
|
||||
if( circular_buffer[i] != 0 )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue