projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Yet another place where Odr_int should be in use
[idzebra-moved-to-github.git]
/
data1
/
d1_sumout.c
diff --git
a/data1/d1_sumout.c
b/data1/d1_sumout.c
index
77677de
..
258345c
100644
(file)
--- a/
data1/d1_sumout.c
+++ b/
data1/d1_sumout.c
@@
-1,8
+1,5
@@
-/* $Id: d1_sumout.c,v 1.9 2007-01-15 15:10:14 adam Exp $
- Copyright (C) 1995-2007
- Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+ Copyright (C) 1994-2010 Index Data
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
Zebra is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-28,18
+25,15
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/proto.h>
#include <idzebra/data1.h>
#include <yaz/proto.h>
#include <idzebra/data1.h>
-static int *f_integer(data1_node *c, ODR o)
+static Odr_int *f_integer(data1_node *c, ODR o)
{
{
- int *r;
char intbuf[64];
if (!c->child || c->child->which != DATA1N_data ||
c->child->u.data.len > 63)
return 0;
char intbuf[64];
if (!c->child || c->child->which != DATA1N_data ||
c->child->u.data.len > 63)
return 0;
- r = (int *)odr_malloc(o, sizeof(*r));
sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
sprintf(intbuf, "%.*s", 63, c->child->u.data.data);
- *r = atoi(intbuf);
- return r;
+ return odr_intdup(o, atoi(intbuf));
}
static char *f_string(data1_node *c, ODR o)
}
static char *f_string(data1_node *c, ODR o)
@@
-117,6
+111,7
@@
Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n,
/*
* Local variables:
* c-basic-offset: 4
/*
* 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