X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=dict%2Finsert.c;h=54d4faf1d99615036b2de94ee37bcf8d78128d86;hb=9eaf65aa25be411fbd6298292f5ad7a7df7083ed;hp=2d4543a8767ff001147f2bf11863f09b29ccc8d3;hpb=5437b50633032595afe6f87dc0f989bc92a5aea8;p=idzebra-moved-to-github.git diff --git a/dict/insert.c b/dict/insert.c index 2d4543a..54d4faf 100644 --- a/dict/insert.c +++ b/dict/insert.c @@ -1,6 +1,6 @@ -/* $Id: insert.c,v 1.23 2004-11-19 10:26:55 heikki Exp $ - Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 - Index Data Aps +/* $Id: insert.c,v 1.28 2006-08-29 13:39:18 adam Exp $ + Copyright (C) 1995-2006 + Index Data ApS This file is part of the Zebra server. @@ -15,9 +15,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 + */ @@ -27,7 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#include +#include "dict-p.h" #define CHECK 0 @@ -437,15 +437,24 @@ static int dict_ins (Dict dict, const Dict_char *str, int dict_insert (Dict dict, const char *str, int userlen, void *userinfo) { + if (!dict->rw) + return -1; if (!dict->head.root) { void *p; - if (dict->rw) - dict->head.root = new_page (dict, 0, &p); + dict->head.root = new_page (dict, 0, &p); if (!dict->head.root) - return 0; + return -1; } return dict_ins (dict, (const Dict_char *) str, dict->head.root, userlen, userinfo); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +