X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_sumout.c;h=fb4094f630948c79061627c8fc9183bb8a5018eb;hp=678eaceb02695480391b42bf9ec251b34137d281;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=97a7adeb9e5059463f039495cc01cfa448463a27 diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c index 678eace..fb4094f 100644 --- a/data1/d1_sumout.c +++ b/data1/d1_sumout.c @@ -1,5 +1,5 @@ /* This file is part of the Zebra server. - Copyright (C) 1995-2008 Index Data + Copyright (C) 1994-2011 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 @@ -25,18 +25,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include -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; - r = (int *)odr_malloc(o, sizeof(*r)); 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) @@ -114,6 +111,7 @@ Z_BriefBib *data1_nodetosummary (data1_handle dh, data1_node *n, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab