X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_attset.c;h=9aa4743198d157900224c781b5e2af9b68ff08c9;hb=aae116a2ec79fd3487ac2d50ad2d6110f64145b2;hp=fd0bd7213742218a888f1ae42c000e0affe26d13;hpb=1872e3fc60b482771bbd1cb4b0290b8d6a9ef5d0;p=idzebra-moved-to-github.git diff --git a/data1/d1_attset.c b/data1/d1_attset.c index fd0bd72..9aa4743 100644 --- a/data1/d1_attset.c +++ b/data1/d1_attset.c @@ -1,8 +1,5 @@ -/* $Id: d1_attset.c,v 1.14 2007-04-16 08:44:31 adam Exp $ - Copyright (C) 1995-2007 - Index Data ApS - -This file is part of the Zebra server. +/* This file is part of the Zebra server. + Copyright (C) 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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -32,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)) @@ -87,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); @@ -106,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); @@ -167,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)); @@ -187,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