Do not build for Ubuntu raring, quantal (obsolete)

[idzebra-moved-to-github.git] / index / orddict.c

diff --git a/index/orddict.c b/index/orddict.c
index a711749..2ad7fd5 100644 (file)
--- a/index/orddict.c
+++ b/index/orddict.c
@@ -1,8 +1,5 @@
-/* $Id: orddict.c,v 1.5 2007-01-15 15:10:16 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) 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 <yaz/wrbuf.h>
 #include "index.h"
@@ -42,8 +42,8 @@ WRBUF zebra_mk_ord_str(int ord, const char *str)
 char *dict_lookup_ord(Dict d, int ord, const char *str)
 {
     WRBUF w = zebra_mk_ord_str(ord, str);
-    char *rinfo = dict_lookup(d, wrbuf_buf(w));
-    wrbuf_free(w, 1);
+    char *rinfo = dict_lookup(d, wrbuf_cstr(w));
+    wrbuf_destroy(w);
     return rinfo;
 }
 
@@ -51,16 +51,16 @@ int dict_insert_ord(Dict d, int ord, const char *p,
                    int userlen, void *userinfo)
 {
     WRBUF w = zebra_mk_ord_str(ord, p);
-    int r = dict_insert(d, wrbuf_buf(w), userlen, userinfo);
-    wrbuf_free(w, 1);
+    int r = dict_insert(d, wrbuf_cstr(w), userlen, userinfo);
+    wrbuf_destroy(w);
     return r;
 }
 
 int dict_delete_ord(Dict d, int ord, const char *p)
 {
     WRBUF w = zebra_mk_ord_str(ord, p);
-    int r = dict_delete(d, wrbuf_buf(w));
-    wrbuf_free(w, 1);
+    int r = dict_delete(d, wrbuf_cstr(w));
+    wrbuf_destroy(w);
     return r;
 }
 
@@ -68,13 +68,14 @@ int dict_delete_subtree_ord(Dict d, int ord, void *client,
                            int (*f)(const char *info, void *client))
 {
     WRBUF w = zebra_mk_ord_str(ord, "");
-    int r = dict_delete_subtree(d, wrbuf_buf(w), client, f);
-    wrbuf_free(w, 1);
+    int r = dict_delete_subtree(d, wrbuf_cstr(w), client, f);
+    wrbuf_destroy(w);
     return r;
 }
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab