/*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1997, Index Data.
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: d1_espec.c,v $
- * Revision 1.8 1997-09-05 09:50:56 adam
+ * Revision 1.11 1997-09-29 13:18:59 adam
+ * Added function, oid_ent_to_oid, to replace the function
+ * oid_getoidbyent, which is not thread safe.
+ *
+ * Revision 1.10 1997/09/29 07:21:10 adam
+ * Added typecast to avoid warnings on MSVC.
+ *
+ * Revision 1.9 1997/09/17 12:10:35 adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.8 1997/09/05 09:50:56 adam
* Removed global data1_tabpath - uses data1_get_tabpath() instead.
*
* Revision 1.7 1997/05/14 06:54:02 adam
Z_Variant *r = odr_malloc(o, sizeof(*r));
oident var1;
int i;
+ int oid[OID_SIZE];
var1.proto = PROTO_Z3950;
var1.oclass = CLASS_VARSET;
var1.value = VAL_VAR1;
- r->globalVariantSetId = odr_oiddup(o, oid_getoidbyent(&var1));
+ r->globalVariantSetId = odr_oiddup(o, oid_ent_to_oid(&var1, oid));
if (argc)
r->triples = odr_malloc(o, sizeof(Z_Triple*) * argc);
* Read an element-set specification from a file.
* NOTE: If !o, memory is allocated directly from the heap by odr_malloc().
*/
-Z_Espec1 *data1_read_espec1(char *file, ODR o)
+Z_Espec1 *data1_read_espec1 (data1_handle dh, const char *file, ODR o)
{
FILE *f;
int argc, size_esn = 0;
char *argv[50], line[512];
Z_Espec1 *res = odr_malloc(o, sizeof(*res));
- if (!(f = yaz_path_fopen(data1_get_tabpath(), file, "r")))
+ if (!(f = yaz_path_fopen(data1_get_tabpath(dh), file, "r")))
{
logf(LOG_WARN|LOG_ERRNO, "%s", file);
return 0;
if (!res->elements)
res->elements = odr_malloc(o, size_esn = 24*sizeof(er));
- else if (res->num_elements >= size_esn/sizeof(er))
+ else if (res->num_elements >= (int) (size_esn/sizeof(er)))
{
size_esn *= 2;
if (o)