projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move yaz_record_conv_type to XML2-only area
[yaz-moved-to-github.git]
/
src
/
prt-ext.c
diff --git
a/src/prt-ext.c
b/src/prt-ext.c
index
ccd2999
..
fc4906c
100644
(file)
--- a/
src/prt-ext.c
+++ b/
src/prt-ext.c
@@
-1,12
+1,14
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file prt-ext.c
* \brief Implements handling of various Z39.50 Externals
*/
/**
* \file prt-ext.c
* \brief Implements handling of various Z39.50 Externals
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <yaz/proto.h>
#include <yaz/proto.h>
@@
-221,7
+223,7
@@
int z_External(ODR o, Z_External **p, int opt, const char *name)
Odr_oct *oct;
int r;
if (!odr_implicit_tag(o, odr_octetstring, &oct,
Odr_oct *oct;
int r;
if (!odr_implicit_tag(o, odr_octetstring, &oct,
- ODR_CONTEXT, 1, 0, "octetaligned"))
+ ODR_CONTEXT, 1, 0, "octetaligned"))
return 0;
/* Save our decoding ODR members */
return 0;
/* Save our decoding ODR members */
@@
-259,18
+261,12
@@
int z_External(ODR o, Z_External **p, int opt, const char *name)
Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len)
{
Z_External *thisext;
Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len)
{
Z_External *thisext;
- char oid_str_buf[OID_STR_MAX];
- const char *oid_str;
- oid_class oclass;
if (!oid)
return 0;
thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
thisext->descriptor = 0;
thisext->indirect_reference = 0;
if (!oid)
return 0;
thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
thisext->descriptor = 0;
thisext->indirect_reference = 0;
-
- oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf);
-
thisext->direct_reference = odr_oiddup(o, oid);
if (len < 0) /* Structured data */
thisext->direct_reference = odr_oiddup(o, oid);
if (len < 0) /* Structured data */
@@
-312,8
+308,8
@@
Z_External *z_ext_record_oid(ODR o, const Odr_oid *oid, const char *buf, int len
return 0;
}
}
return 0;
}
}
- else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs)) /* SUTRS is a single-ASN.1-type */
- {
+ else if (!oid_oidcmp(oid, yaz_oid_recsyn_sutrs))
+ { /* SUTRS is a single-ASN.1-type */
Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs));
thisext->which = Z_External_sutrs;
Odr_oct *sutrs = (Odr_oct *)odr_malloc(o, sizeof(*sutrs));
thisext->which = Z_External_sutrs;
@@
-341,18
+337,12
@@
Z_External *z_ext_record_oid_any(ODR o, const Odr_oid *oid,
const char *buf, int len)
{
Z_External *thisext;
const char *buf, int len)
{
Z_External *thisext;
- char oid_str_buf[OID_STR_MAX];
- const char *oid_str;
- oid_class oclass;
if (!oid)
return 0;
thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
thisext->descriptor = 0;
thisext->indirect_reference = 0;
if (!oid)
return 0;
thisext = (Z_External *) odr_malloc(o, sizeof(*thisext));
thisext->descriptor = 0;
thisext->indirect_reference = 0;
-
- oid_str = yaz_oid_to_string_buf(oid, &oclass, oid_str_buf);
-
thisext->direct_reference = odr_oiddup(o, oid);
thisext->which = Z_External_single;
thisext->direct_reference = odr_oiddup(o, oid);
thisext->which = Z_External_single;