-/* $Id: orddict.c,v 1.4 2006-08-14 10:40:15 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
*/
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <assert.h>
#include <yaz/wrbuf.h>
#include "index.h"
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;
}
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;
}
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