From 852c2d471176b3f597b6b2a328a3c6eba0965ad3 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Mon, 22 Aug 2005 08:19:51 +0000 Subject: [PATCH] Members in RecWord term_buf, index_name changed from char * to const char *. --- include/idzebra/recctrl.h | 6 +++--- recctrl/recgrs.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/include/idzebra/recctrl.h b/include/idzebra/recctrl.h index e2183e5..4db54cc 100644 --- a/include/idzebra/recctrl.h +++ b/include/idzebra/recctrl.h @@ -1,4 +1,4 @@ -/* $Id: recctrl.h,v 1.13 2005-08-18 12:50:17 adam Exp $ +/* $Id: recctrl.h,v 1.14 2005-08-22 08:19:51 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -49,8 +49,8 @@ typedef struct { int attrUse; #endif unsigned index_type; - char *index_name; - char *term_buf; + const char *index_name; + const char *term_buf; int term_len; zint seqno; zint record_id; diff --git a/recctrl/recgrs.c b/recctrl/recgrs.c index 2ea2a53..5cf015b 100644 --- a/recctrl/recgrs.c +++ b/recctrl/recgrs.c @@ -1,4 +1,4 @@ -/* $Id: recgrs.c,v 1.104 2005-08-03 07:44:27 adam Exp $ +/* $Id: recgrs.c,v 1.105 2005-08-22 08:19:51 adam Exp $ Copyright (C) 1995-2005 Index Data ApS @@ -220,16 +220,20 @@ static int sp_expr(struct source_parser *sp, data1_node *n, RecWord *wrd) } else if (sp->len > 0 && isdigit(*(unsigned char *)sp->tok)) { - wrd->term_buf = nmem_malloc(sp->nmem, sp->len); - memcpy(wrd->term_buf, sp->tok, sp->len); + char *b; wrd->term_len = sp->len; + b = nmem_malloc(sp->nmem, sp->len); + memcpy(b, sp->tok, sp->len); + wrd->term_buf = b; sp_lex(sp); } else if (sp->len > 2 && sp->tok[0] == '\'' && sp->tok[sp->len-1] == '\'') { + char *b; wrd->term_len = sp->len - 2; - wrd->term_buf = nmem_malloc(sp->nmem, wrd->term_len); - memcpy(wrd->term_buf, sp->tok+1, wrd->term_len); + b = nmem_malloc(sp->nmem, wrd->term_len); + memcpy(b, sp->tok+1, wrd->term_len); + wrd->term_buf = b; sp_lex(sp); } else -- 1.7.10.4