X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_attset.c;h=b2ddc6bfa556658b1dbfbaeead75608a9c0bfb3c;hb=585e87e5a6b274a8ee13b5432a462afd95c04096;hp=8bd114195f7ee820913f84d1fc9024afd2b0e7c0;hpb=89d16cf15eda0e4802d18b8ad09bd3653508ebfc;p=idzebra-moved-to-github.git diff --git a/data1/d1_attset.c b/data1/d1_attset.c index 8bd1141..b2ddc6b 100644 --- a/data1/d1_attset.c +++ b/data1/d1_attset.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1994-2009 Index Data + Copyright (C) 2004-2013 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 @@ -17,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -29,7 +32,7 @@ data1_att *data1_getattbyname(data1_handle dh, data1_attset *s, const char *name { data1_att *r; data1_attset_child *c; - + /* 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; - + 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]; - + 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; - + } *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 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab