X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvalue-labels.c;h=16e649687cb577db05891b75f9ee913251d92f6e;hb=d8528fd919d1cebe194121ba267faa0f4ee48c94;hp=39c1005e90f08e48ab5c4cefaffcb774c6bd83ef;hpb=3a7fba81ceae5b049d0f7d671e9e3c3c43bbf703;p=pspp

diff --git a/src/value-labels.c b/src/value-labels.c
index 39c1005e90..16e649687c 100644
--- a/src/value-labels.c
+++ b/src/value-labels.c
@@ -19,11 +19,11 @@
 
 #include <config.h>
 #include "value-labels.h"
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
-#include <string.h>
 #include "alloc.h"
 #include "hash.h"
+#include "str.h"
 
 static hsh_compare_func compare_int_val_lab;
 static hsh_hash_func hash_int_val_lab;
@@ -32,7 +32,7 @@ static hsh_free_func free_int_val_lab;
 struct atom;
 static struct atom *atom_create (const char *string);
 static void atom_destroy (struct atom *);
-static const char *atom_to_string (const struct atom *);
+static char *atom_to_string (const struct atom *);
 
 /* A set of value labels. */
 struct val_labs 
@@ -232,7 +232,7 @@ val_labs_remove (struct val_labs *vls, union value value)
    returns the label; otherwise, returns a null pointer.  If
    VLS's width is greater than MAX_SHORT_STRING, always returns a
    null pointer. */
-const char *
+char *
 val_labs_find (const struct val_labs *vls, union value value) 
 {
   assert (vls != NULL);
@@ -384,7 +384,7 @@ hash_int_val_lab (const void *vl_, void *vls_)
 
 /* Free a value label. */
 void
-free_int_val_lab (void *vl_, void *vls_ unused) 
+free_int_val_lab (void *vl_, void *vls_ UNUSED) 
 {
   struct int_val_lab *vl = vl_;
 
@@ -452,7 +452,7 @@ atom_destroy (struct atom *atom)
 }
 
 /* Returns the string associated with ATOM. */
-static const char *
+static  char *
 atom_to_string (const struct atom *atom) 
 {
   assert (atom != NULL);
@@ -462,7 +462,7 @@ atom_to_string (const struct atom *atom)
 
 /* A hsh_compare_func that compares A and B. */
 static int
-compare_atoms (const void *a_, const void *b_, void *aux unused) 
+compare_atoms (const void *a_, const void *b_, void *aux UNUSED) 
 {
   const struct atom *a = a_;
   const struct atom *b = b_;
@@ -472,7 +472,7 @@ compare_atoms (const void *a_, const void *b_, void *aux unused)
 
 /* A hsh_hash_func that hashes ATOM. */
 static unsigned
-hash_atom (const void *atom_, void *aux unused) 
+hash_atom (const void *atom_, void *aux UNUSED) 
 {
   const struct atom *atom = atom_;
 
@@ -481,10 +481,44 @@ hash_atom (const void *atom_, void *aux unused)
 
 /* A hsh_free_func that destroys ATOM. */
 static void
-free_atom (void *atom_, void *aux unused) 
+free_atom (void *atom_, void *aux UNUSED) 
 {
   struct atom *atom = atom_;
 
   free (atom->string);
   free (atom);
 }
+
+
+/* Get a string representing the value.
+   That is, if it has a label, then return that label,
+   otherwise, if the value is alpha, then return the string for it,
+   else format it and return the formatted string
+*/
+const char *
+value_to_string(const union value *val, const struct variable *var)
+{
+  static char buf[100];
+  char *s;
+  const struct val_labs *val_labs ;
+  
+  if ( !val || ! var ) 
+    return 0;
+
+  val_labs = var->val_labs;
+
+  
+  s = val_labs_find (val_labs, *val);
+
+  if ( s ) 
+    return s;
+
+  if ( 0 == var->width ) 
+    snprintf(buf,100,"%g",val->f);
+  else
+    {
+      strncpy(buf,val->s,MAX_SHORT_STRING);
+      strcat(buf,"\0");
+    }
+  return buf;
+}