#include <libpspp/str.h>
#include "value-labels.h"
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
if (width == 0)
return a->f < b->f ? -1 : a->f > b->f;
else
- return memcmp (a->s, b->s, min(MAX_SHORT_STRING, width));
+ return memcmp (a->s, b->s, MIN(MAX_SHORT_STRING, width));
}
/* Create a hash of v */
if ( 0 == width )
id_hash = hsh_hash_double (v->f);
else
- id_hash = hsh_hash_bytes (v->s, min(MAX_SHORT_STRING, width));
+ id_hash = hsh_hash_bytes (v->s, MIN(MAX_SHORT_STRING, width));
return id_hash;
}
/* A hsh_compare_func that orders variables A and B by their
names. */
int
-compare_var_names (const void *a_, const void *b_, void *foo UNUSED)
+compare_var_names (const void *a_, const void *b_, const void *aux UNUSED)
{
const struct variable *a = a_;
const struct variable *b = b_;
/* A hsh_hash_func that hashes variable V based on its name. */
unsigned
-hash_var_name (const void *v_, void *foo UNUSED)
+hash_var_name (const void *v_, const void *aux UNUSED)
{
const struct variable *v = v_;
/* A hsh_compare_func that orders pointers to variables A and B
by their names. */
int
-compare_var_ptr_names (const void *a_, const void *b_, void *foo UNUSED)
+compare_var_ptr_names (const void *a_, const void *b_, const void *aux UNUSED)
{
struct variable *const *a = a_;
struct variable *const *b = b_;
/* A hsh_hash_func that hashes pointer to variable V based on its
name. */
unsigned
-hash_var_ptr_name (const void *v_, void *foo UNUSED)
+hash_var_ptr_name (const void *v_, const void *aux UNUSED)
{
struct variable *const *v = v_;
int
width_to_bytes(int width)
{
- const int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
- const int remainder = width - (chunks * EFFECTIVE_LONG_STRING_LENGTH) ;
- int bytes, mod8;
-
assert (width >= 0);
if ( width == 0 )
return MAX_SHORT_STRING ;
-
- if ( width <= MAX_LONG_STRING)
- return MAX_SHORT_STRING * DIV_RND_UP(width, MAX_SHORT_STRING);
-
-
- bytes = remainder + (chunks * (MAX_LONG_STRING + 1) );
-
- /* Round up to the nearest 8 */
- mod8 = bytes % MAX_SHORT_STRING;
-
- if ( mod8 )
- bytes += MAX_SHORT_STRING - mod8;
-
- assert( bytes % MAX_SHORT_STRING == 0 );
-
- return bytes;
+ else if (width <= MAX_LONG_STRING)
+ return ROUND_UP (width, MAX_SHORT_STRING);
+ else
+ {
+ int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
+ int remainder = width % EFFECTIVE_LONG_STRING_LENGTH ;
+ int bytes = remainder + (chunks * (MAX_LONG_STRING + 1) );
+ return ROUND_UP (bytes, MAX_SHORT_STRING);
+ }
}