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
yaz_url_exec: minor adjustments to log msgs
[yaz-moved-to-github.git]
/
src
/
odr_oid.c
diff --git
a/src/odr_oid.c
b/src/odr_oid.c
index
1034a7b
..
276afa6
100644
(file)
--- a/
src/odr_oid.c
+++ b/
src/odr_oid.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: odr_oid.c,v 1.8 2007-01-03 08:42:15 adam Exp $
*/
/**
* \file odr_oid.c
*/
/**
* \file odr_oid.c
@@
-12,8
+10,8
@@
#include <config.h>
#endif
#include <config.h>
#endif
+#include <yaz/oid_util.h>
#include "odr-priv.h"
#include "odr-priv.h"
-#include <yaz/oid.h>
/*
* Top level oid en/decoder.
/*
* Top level oid en/decoder.
@@
-25,12
+23,13
@@
int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
if (o->error)
return 0;
if (o->error)
return 0;
- if (o->t_class < 0)
+ if (o->op->t_class < 0)
{
{
- o->t_class = ODR_UNIVERSAL;
- o->t_tag = ODR_OID;
+ o->op->t_class = ODR_UNIVERSAL;
+ o->op->t_tag = ODR_OID;
}
}
- if ((res = ber_tag(o, p, o->t_class, o->t_tag, &cons, opt, name)) < 0)
+ res = ber_tag(o, p, o->op->t_class, o->op->t_tag, &cons, opt, name);
+ if (res < 0)
return 0;
if (!res)
return odr_missing(o, opt, name);
return 0;
if (!res)
return odr_missing(o, opt, name);
@@
-51,12
+50,13
@@
int odr_oid(ODR o, Odr_oid **p, int opt, const char *name)
return 1;
}
if (o->direction == ODR_DECODE)
return 1;
}
if (o->direction == ODR_DECODE)
- *p = (int *)odr_malloc(o, OID_SIZE * sizeof(**p));
+ *p = (Odr_oid *)odr_malloc(o, OID_SIZE * sizeof(**p));
return ber_oidc(o, *p, OID_SIZE);
}
/*
* Local variables:
* c-basic-offset: 4
return ber_oidc(o, *p, OID_SIZE);
}
/*
* 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