projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update all #include directives to the currently preferred style.
[pspp-builds.git]
/
src
/
data
/
value-labels.h
diff --git
a/src/data/value-labels.h
b/src/data/value-labels.h
index 460ab84c17c919d821c4c477a2c3fd033b520bbb..6cb5259edb2fe22a28b53b49bba4a8e2e9fb1b1c 100644
(file)
--- a/
src/data/value-labels.h
+++ b/
src/data/value-labels.h
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2009
, 2011
Free Software Foundation, Inc.
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
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
@@
-27,8
+27,8
@@
#include <stdbool.h>
#include <stddef.h>
#include <stdbool.h>
#include <stddef.h>
-#include
<data/value.h>
-#include
<libpspp/hmap.h>
+#include
"data/value.h"
+#include
"libpspp/hmap.h"
/* One value label.
/* One value label.
@@
-38,7
+38,7
@@
struct val_lab
{
struct hmap_node node; /* Node in hash map. */
union value value; /* The value being labeled. */
{
struct hmap_node node; /* Node in hash map. */
union value value; /* The value being labeled. */
-
struct atom *label; /* A ref-count
ed string. */
+
const char *label; /* An intern
ed string. */
};
/* Returns the value in VL. The caller must not modify or free
};
/* Returns the value in VL. The caller must not modify or free
@@
-52,7
+52,13
@@
static inline const union value *val_lab_get_value (const struct val_lab *vl)
return &vl->value;
}
return &vl->value;
}
-const char *val_lab_get_label (const struct val_lab *);
+/* Returns the label in VL. The caller must not modify or free the returned
+ value. */
+static inline const char *
+val_lab_get_label (const struct val_lab *vl)
+{
+ return vl->label;
+}
\f
/* A set of value labels. */
struct val_labs
\f
/* A set of value labels. */
struct val_labs