Merging upstream version 1.7.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
2c9a359ab6
commit
5b51478421
10 changed files with 34 additions and 50 deletions
4
main.c
4
main.c
|
@ -168,7 +168,7 @@ static unsigned long getnum( const char * const ptr,
|
|||
|
||||
if( !errno && tail[0] )
|
||||
{
|
||||
int factor = ( tail[1] == 'i' ) ? 1024 : 1000;
|
||||
const int factor = ( tail[1] == 'i' ) ? 1024 : 1000;
|
||||
int exponent = 0, i;
|
||||
bool bad_multiplier = false;
|
||||
switch( tail[0] )
|
||||
|
@ -211,7 +211,7 @@ static unsigned long getnum( const char * const ptr,
|
|||
static int get_dict_size( const char * const arg )
|
||||
{
|
||||
char * tail;
|
||||
int bits = strtol( arg, &tail, 0 );
|
||||
const int bits = strtol( arg, &tail, 0 );
|
||||
if( bits >= min_dictionary_bits &&
|
||||
bits <= max_dictionary_bits && *tail == 0 )
|
||||
return ( 1 << bits );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue