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
Version 2.0.51
[idzebra-moved-to-github.git]
/
data1
/
d1_espec.c
diff --git
a/data1/d1_espec.c
b/data1/d1_espec.c
index
4c64840
..
ea73ee4
100644
(file)
--- a/
data1/d1_espec.c
+++ b/
data1/d1_espec.c
@@
-1,8
+1,5
@@
-/* $Id: d1_espec.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) 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
@@
-20,6
+17,9
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <assert.h>
#include <string.h>
#include <stdlib.h>
#include <assert.h>
#include <string.h>
@@
-37,7
+37,7
@@
static Z_Variant *read_variant(int argc, char **argv, NMEM nmem,
Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r));
int i;
Z_Variant *r = (Z_Variant *)nmem_malloc(nmem, sizeof(*r));
int i;
- r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_variant1());
+ r->globalVariantSetId = odr_oiddup_nmem(nmem, yaz_oid_varset_variant_1);
if (argc)
r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
else
if (argc)
r->triples = (Z_Triple **)nmem_malloc(nmem, sizeof(Z_Triple*) * argc);
else
@@
-360,6
+360,7
@@
Z_Espec1 *data1_read_espec1 (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