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
Bundle sha1 rather than use libgcrypt/nettle
[yaz-moved-to-github.git]
/
src
/
odr_int.c
diff --git
a/src/odr_int.c
b/src/odr_int.c
index
68663b5
..
ba35c9d
100644
(file)
--- a/
src/odr_int.c
+++ b/
src/odr_int.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2008 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-16,7
+16,7
@@
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
* Top level integer en/decoder.
* Returns 1 on success, 0 on error.
*/
-int odr_integer(ODR o, int **p, int opt, const char *name)
+int odr_integer(ODR o, Odr_int **p, int opt, const char *name)
{
int res, cons = 0;
{
int res, cons = 0;
@@
-35,7
+35,7
@@
int odr_integer(ODR o, int **p, int opt, const char *name)
if (o->direction == ODR_PRINT)
{
odr_prname(o, name);
if (o->direction == ODR_PRINT)
{
odr_prname(o, name);
- odr_printf(o, "%d\n", **p);
+ odr_printf(o, ODR_INT_PRINTF "\n", **p);
return 1;
}
if (cons)
return 1;
}
if (cons)
@@
-44,12
+44,13
@@
int odr_integer(ODR o, int **p, int opt, const char *name)
return 0;
}
if (o->direction == ODR_DECODE)
return 0;
}
if (o->direction == ODR_DECODE)
- *p = (int *)odr_malloc(o, sizeof(int));
+ *p = (Odr_int *)odr_malloc(o, sizeof(**p));
return ber_integer(o, *p);
}
/*
* Local variables:
* c-basic-offset: 4
return ber_integer(o, *p);
}
/*
* 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