X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Forddict.c;h=5c9b5a73d6732b1f236051f14382234cc64ebdca;hp=e93d04f1f11c3936fdbee76da0939567c81569f0;hb=a030c87bc444608639905eca95e29f84a4f1d991;hpb=1d09966e51904c44ed82eaa920ffc9fbcc087541

diff --git a/index/orddict.c b/index/orddict.c
index e93d04f..5c9b5a7 100644
--- a/index/orddict.c
+++ b/index/orddict.c
@@ -1,8 +1,5 @@
-/* $Id: orddict.c,v 1.2 2006-02-09 08:31:02 adam Exp $
-   Copyright (C) 1995-2005
-   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
@@ -15,9 +12,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <assert.h>
@@ -42,8 +39,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 +48,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,7 +65,16 @@ 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
+ */
+