RPM: store libs in %{_libdir}

[idzebra-moved-to-github.git] / data1 / d1_sumout.c

diff --git a/data1/d1_sumout.c b/data1/d1_sumout.c
index 563fbf7..8d30cca 100644 (file)
--- a/data1/d1_sumout.c
+++ b/data1/d1_sumout.c
@@ -1,8 +1,5 @@
-/* $Id: d1_sumout.c,v 1.8 2006-08-14 10:40:06 adam Exp $
-   Copyright (C) 1995-2006
-   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 <config.h>
+#endif
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
@@ -28,18 +28,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #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;
-    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