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
/
attributes.c
diff --git
a/src/data/attributes.c
b/src/data/attributes.c
index aa1282908438857be3437936f0d78574790625db..7fc546ee23771e7382232b88c92555289aa8df80 100644
(file)
--- a/
src/data/attributes.c
+++ b/
src/data/attributes.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 2008 Free Software Foundation, Inc.
+ Copyright (C) 2008
, 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
@@
-16,12
+16,15
@@
#include <config.h>
#include <config.h>
-#include <data/attributes.h>
+#include "data/attributes.h"
+
#include <assert.h>
#include <string.h>
#include <assert.h>
#include <string.h>
-#include <libpspp/array.h>
-#include <libpspp/hash-functions.h>
-#include "xalloc.h"
+
+#include "libpspp/array.h"
+#include "libpspp/hash-functions.h"
+
+#include "gl/xalloc.h"
/* A custom attribute of the sort maintained by the DATAFILE
ATTRIBUTE and VARIABLE ATTRIBUTE commands.
/* A custom attribute of the sort maintained by the DATAFILE
ATTRIBUTE and VARIABLE ATTRIBUTE commands.
@@
-220,7
+223,7
@@
attrset_lookup (struct attrset *set, const char *name)
{
struct attribute *attr;
HMAP_FOR_EACH_WITH_HASH (attr, struct attribute, node,
{
struct attribute *attr;
HMAP_FOR_EACH_WITH_HASH (attr, struct attribute, node,
- h
sh_hash_case_string (name
), &set->map)
+ h
ash_case_string (name, 0
), &set->map)
if (!strcasecmp (attribute_get_name (attr), name))
break;
return attr;
if (!strcasecmp (attribute_get_name (attr), name))
break;
return attr;
@@
-234,7
+237,7
@@
attrset_add (struct attrset *set, struct attribute *attr)
{
const char *name = attribute_get_name (attr);
assert (attrset_lookup (set, name) == NULL);
{
const char *name = attribute_get_name (attr);
assert (attrset_lookup (set, name) == NULL);
- hmap_insert (&set->map, &attr->node, h
sh_hash_case_string (name
));
+ hmap_insert (&set->map, &attr->node, h
ash_case_string (name, 0
));
}
/* Deletes any attribute from SET that matches NAME
}
/* Deletes any attribute from SET that matches NAME