#include <config.h>
#include "variable.h"
+#include <libpspp/assertion.h>
#include <libpspp/message.h>
#include <stdlib.h>
#include <libpspp/alloc.h>
#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_;
case DC_SCRATCH:
return _("scratch");
default:
- assert (0);
- abort ();
- }
-}
-
-
-/* Copies buffer SRC, of SRC_SIZE bytes, to DST, of DST_SIZE bytes.
- Each 256th byte, which is expected to be a ' ', is deleted.
- DST is then truncated to DST_SIZE bytes or padded on the right with
- spaces as needed. */
-void
-copy_demangle (char *dst, size_t dst_size,
- const char *src, size_t src_size)
-{
- int src_bytes_left = src_size;
- int dst_bytes_left = dst_size;
- const char *s = src;
- char *d = dst;
-
-
- while( src_bytes_left > 0 )
- {
- const size_t s_chunk = min(MAX_LONG_STRING, src_bytes_left);
- const size_t d_chunk = min(MAX_LONG_STRING, dst_bytes_left);
-
- assert ( d < dst + dst_size);
-
- buf_copy_rpad (d, d_chunk,
- s, s_chunk);
-
- d += d_chunk;
- s += s_chunk;
- src_bytes_left -= s_chunk;
- dst_bytes_left -= d_chunk;
-
- if ( src_bytes_left > 0 && ! (++s - src) % (MAX_LONG_STRING+1) )
- {
- if ( *s != ' ')
- msg(MW, _("Expected a space in very long string"));
- src_bytes_left--;
- }
- }
-}
-
-/* Copies buffer SRC, of SRC_SIZE bytes, to DST, of DST_SIZE bytes.
- DST is rounded up to the nearest 8 byte boundary.
- A space is inserted at each 256th byte.
- DST is then truncated to DST_SIZE bytes or padded on the right with
- spaces as needed. */
-void
-copy_mangle (char *dst, size_t dst_size,
- const char *src, size_t src_size)
-{
- int src_bytes_left = src_size;
- int dst_bytes_left = dst_size;
- const char *s = src;
- char *d = dst;
-
- memset(dst, ' ', dst_size);
-
- while( src_bytes_left > 0 )
- {
- const size_t s_chunk = min(MAX_LONG_STRING, src_bytes_left);
- const size_t d_chunk = min(MAX_LONG_STRING, dst_bytes_left);
-
- buf_copy_rpad (d, d_chunk, s, s_chunk);
-
- d += d_chunk;
- s += s_chunk;
- src_bytes_left -= s_chunk;
- dst_bytes_left -= d_chunk;
-
- if ( dst_bytes_left > 0 && 0 == ( d + 1 - dst ) % (MAX_LONG_STRING + 1) )
- {
- memset(d, ' ', 1);
- d++;
- dst_bytes_left--;
- }
+ NOT_REACHED ();
}
}
int
width_to_bytes(int width)
{
- 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);
-
- const int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
-
- const int remainder = width - (chunks * EFFECTIVE_LONG_STRING_LENGTH) ;
-
- 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);
+ }
}
+