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
Version 5.9.0
[yaz-moved-to-github.git]
/
src
/
odr_oct.c
diff --git
a/src/odr_oct.c
b/src/odr_oct.c
index
a64648a
..
d9c35a8
100644
(file)
--- a/
src/odr_oct.c
+++ b/
src/odr_oct.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-45,9
+45,6
@@
int odr_octetstring(ODR o, Odr_oct **p, int opt, const char *name)
if (o->direction == ODR_DECODE)
{
*p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
if (o->direction == ODR_DECODE)
{
*p = (Odr_oct *)odr_malloc(o, sizeof(Odr_oct));
-#if OCT_SIZE
- (*p)->size= 0;
-#endif
(*p)->len = 0;
(*p)->buf = 0;
}
(*p)->len = 0;
(*p)->buf = 0;
}
@@
-88,15
+85,9
@@
int odr_cstring(ODR o, char **p, int opt, const char *name)
{
t->buf = *p;
t->len = strlen(*p);
{
t->buf = *p;
t->len = strlen(*p);
-#if OCT_SIZE
- t->size = t->len;
-#endif
}
else
{
}
else
{
-#if OCT_SIZE
- t->size= 0;
-#endif
t->len = 0;
t->buf = 0;
}
t->len = 0;
t->buf = 0;
}
@@
-167,24
+158,15
@@
int odr_iconv_string(ODR o, char **p, int opt, const char *name)
return 0;
}
t->len = outbuf - (char*) t->buf;
return 0;
}
t->len = outbuf - (char*) t->buf;
-#if OCT_SIZE
- t->size = t->len;
-#endif
}
if (!t->buf)
{
t->buf = *p;
t->len = strlen(*p);
}
if (!t->buf)
{
t->buf = *p;
t->len = strlen(*p);
-#if OCT_SIZE
- t->size = t->len;
-#endif
}
}
else
{
}
}
else
{
-#if OCT_SIZE
- t->size= 0;
-#endif
t->len = 0;
t->buf = 0;
}
t->len = 0;
t->buf = 0;
}