projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat: delete trailing whitespace
[idzebra-moved-to-github.git]
/
data1
/
d1_attset.c
diff --git
a/data1/d1_attset.c
b/data1/d1_attset.c
index
8bd1141
..
291acd9
100644
(file)
--- a/
data1/d1_attset.c
+++ b/
data1/d1_attset.c
@@
-1,5
+1,5
@@
/* This file is part of the Zebra server.
/* This file is part of the Zebra server.
- Copyright (C) 1994-2009 Index Data
+ Copyright (C) 1994-2011 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-17,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
@@
-29,7
+32,7
@@
data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, const char *name
{
data1_att *r;
data1_attset_child *c;
{
data1_att *r;
data1_attset_child *c;
-
+
/* scan local set */
for (r = s->atts; r; r = r->next)
if (!data1_matchstr(r->name, name))
/* scan local set */
for (r = s->atts; r; r = r->next)
if (!data1_matchstr(r->name, name))
@@
-84,7
+87,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
char *name;
char *endptr;
data1_att *t;
char *name;
char *endptr;
data1_att *t;
-
+
if (argc < 3)
{
yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
if (argc < 3)
{
yaz_log(YLOG_WARN, "%s:%d: Bad # of args to att", file, lineno);
@@
-103,7
+106,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
continue;
}
name = argv[2];
continue;
}
name = argv[2];
-
+
t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
t->parent = res;
t->name = nmem_strdup(mem, name);
t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));
t->parent = res;
t->name = nmem_strdup(mem, name);
@@
-164,7
+167,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
yaz_log(YLOG_WARN, "%s:%d: Include of attset %s failed",
file, lineno, name);
continue;
yaz_log(YLOG_WARN, "%s:%d: Include of attset %s failed",
file, lineno, name);
continue;
-
+
}
*childp = (data1_attset_child *)
nmem_malloc (mem, sizeof(**childp));
}
*childp = (data1_attset_child *)
nmem_malloc (mem, sizeof(**childp));
@@
-184,6
+187,7
@@
data1_attset *data1_read_attset(data1_handle dh, const char *file)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab