X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fodr_use.c;h=abe390ec6f72488c443239d9f1280e1be2e24e4d;hp=509c4452bbcdccedd3038f56e6aab0b88147a6b8;hb=5d2037ccd6b74ec67f662a83477820792b7172b3;hpb=05c274ef315384faafcc5900c17468f0ea2474e6 diff --git a/src/odr_use.c b/src/odr_use.c index 509c445..abe390e 100644 --- a/src/odr_use.c +++ b/src/odr_use.c @@ -1,8 +1,6 @@ -/* - * Copyright (c) 1995-2004, Index Data +/* This file is part of the YAZ toolkit. + * Copyright (C) Index Data * See the file LICENSE for details. - * - * $Id: odr_use.c,v 1.2 2004-10-15 00:19:00 adam Exp $ */ /** * \file odr_use.c @@ -19,32 +17,32 @@ int odr_external(ODR o, Odr_external **p, int opt, const char *name) Odr_external *pp; static Odr_arm arm[] = { - {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, - (Odr_fun)odr_any, "single"}, - {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, - (Odr_fun)odr_octetstring, "octet"}, - {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, - (Odr_fun)odr_bitstring, "arbitrary"}, - {-1, -1, -1, -1, 0, 0} + {ODR_EXPLICIT, ODR_CONTEXT, 0, ODR_EXTERNAL_single, + (Odr_fun)odr_any, "single"}, + {ODR_IMPLICIT, ODR_CONTEXT, 1, ODR_EXTERNAL_octet, + (Odr_fun)odr_octetstring, "octet"}, + {ODR_IMPLICIT, ODR_CONTEXT, 2, ODR_EXTERNAL_arbitrary, + (Odr_fun)odr_bitstring, "arbitrary"}, + {-1, -1, -1, -1, 0, 0} }; odr_implicit_settag(o, ODR_UNIVERSAL, ODR_EXTERNAL); if (!odr_sequence_begin(o, p, sizeof(Odr_external), name)) - return odr_missing(o, opt, name); + return odr_missing(o, opt, name); pp = *p; return - odr_oid(o, &pp->direct_reference, 1, "direct") && - odr_integer(o, &pp->indirect_reference, 1, "indirect") && - odr_graphicstring(o, &pp->descriptor, 1, "descriptor") && - odr_choice(o, arm, &pp->u, &pp->which, 0) && - odr_sequence_end(o); + odr_oid(o, &pp->direct_reference, 1, "direct") && + odr_integer(o, &pp->indirect_reference, 1, "indirect") && + odr_graphicstring(o, &pp->descriptor, 1, "descriptor") && + odr_choice(o, arm, &pp->u, &pp->which, 0) && + odr_sequence_end(o); } int odr_visiblestring(ODR o, char **p, int opt, const char *name) { return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL, - ODR_VISIBLESTRING, opt, name); -} + ODR_VISIBLESTRING, opt, name); +} /* * a char may not be sufficient to hold a general string, but we'll deal @@ -53,17 +51,26 @@ int odr_visiblestring(ODR o, char **p, int opt, const char *name) int odr_generalstring(ODR o, char **p, int opt, const char *name) { return odr_implicit_tag(o, odr_iconv_string, p, ODR_UNIVERSAL, - ODR_GENERALSTRING,opt, name); -} + ODR_GENERALSTRING,opt, name); +} int odr_graphicstring(ODR o, char **p, int opt, const char *name) { return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL, - ODR_GRAPHICSTRING, opt, name); -} + ODR_GRAPHICSTRING, opt, name); +} int odr_generalizedtime(ODR o, char **p, int opt, const char *name) { return odr_implicit_tag(o, odr_cstring, p, ODR_UNIVERSAL, - ODR_GENERALIZEDTIME, opt, name); + ODR_GENERALIZEDTIME, opt, name); } +/* + * Local variables: + * c-basic-offset: 4 + * c-file-style: "Stroustrup" + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +