X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=data1%2Fd1_sumout.c;h=8d30ccae069b0b47ec4f2b28a113f782d1218632;hp=77677de1adab516d978f8344f8daff2fc7f285ce;hb=693a0db94b4b3ac9aee7722572a6b81a86a12e13;hpb=89d3a004b7c651fd5673abfc192e1472dc4d4197 diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c index 77677de..8d30cca 100644 --- 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-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 @@ -20,6 +17,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if HAVE_CONFIG_H +#include +#endif #include #include #include @@ -28,18 +28,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) @@ -117,6 +114,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