From b4470de12aa07f21f5394c19af0d21b196087225 Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Mon, 23 Aug 2004 12:38:53 +0000 Subject: [PATCH] Removed the VOLATILE flag from rsets --- include/rset.h | 8 +++----- rset/rsbetween.c | 6 +----- rset/rsbool.c | 4 +--- rset/rset.c | 3 +-- rset/rsisamb.c | 3 +-- rset/rsisamc.c | 3 +-- rset/rsisams.c | 3 +-- rset/rsmultior.c | 5 +---- rset/rsprox.c | 39 +-------------------------------------- 9 files changed, 11 insertions(+), 63 deletions(-) diff --git a/include/rset.h b/include/rset.h index 1d22494..23e72ec 100644 --- a/include/rset.h +++ b/include/rset.h @@ -1,4 +1,4 @@ -/* $Id: rset.h,v 1.29 2004-08-20 14:44:45 heikki Exp $ +/* $Id: rset.h,v 1.30 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -56,6 +56,7 @@ int rset_default_forward(RSET ct, RSFD rfd, void *buf, const void *untilbuf); void rset_default_pos(RSFD rfd, double *current, double *total); +/* struct rset_term { char *name; zint nn; @@ -63,11 +64,11 @@ struct rset_term { zint count; int type; }; +*/ typedef struct rset { const struct rset_control *control; - int flags; int count; void *buf; } rset; @@ -108,9 +109,6 @@ RSET rset_dup (RSET rs); /* int rset_type (RSET) */ #define rset_type(rs) ((rs)->control->desc) -#define RSET_FLAG_VOLATILE 1 - -#define rset_is_volatile(rs) ((rs)->flags & RSET_FLAG_VOLATILE) #ifdef __cplusplus } diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 4249c7e..28fa700 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.18 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsbetween.c,v 1.19 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -126,10 +126,6 @@ static void *r_create_between (RSET ct, const struct rset_control *sel, info->rset_m = between_parms->rset_m; info->rset_r = between_parms->rset_r; info->rset_attr = between_parms->rset_attr; - if (rset_is_volatile(info->rset_l) || - rset_is_volatile(info->rset_m) || - rset_is_volatile(info->rset_r)) - ct->flags |= RSET_FLAG_VOLATILE; info->cmp = between_parms->cmp; info->printer = between_parms->printer; info->rfd_list = NULL; diff --git a/rset/rsbool.c b/rset/rsbool.c index 750531a..f33400f 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $Id: rsbool.c,v 1.38 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsbool.c,v 1.39 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -125,8 +125,6 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) info->key_size = bool_parms->key_size; info->rset_l = bool_parms->rset_l; info->rset_r = bool_parms->rset_r; - if (rset_is_volatile(info->rset_l) || rset_is_volatile(info->rset_r)) - ct->flags |= RSET_FLAG_VOLATILE; info->cmp = bool_parms->cmp; info->log_item = bool_parms->log_item; info->rfd_list = NULL; diff --git a/rset/rset.c b/rset/rset.c index d37203f..6355cfa 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -1,4 +1,4 @@ -/* $Id: rset.c,v 1.25 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rset.c,v 1.26 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -37,7 +37,6 @@ RSET rset_create(const struct rset_control *sel, void *parms) logf (LOG_DEBUG, "rs_create(%s)", sel->desc); rnew = (RSET) xmalloc(sizeof(*rnew)); rnew->control = sel; - rnew->flags = 0; rnew->count = 1; rnew->buf = (*sel->f_create)(rnew, sel, parms); return rnew; diff --git a/rset/rsisamb.c b/rset/rsisamb.c index 1c24650..1227cd5 100644 --- a/rset/rsisamb.c +++ b/rset/rsisamb.c @@ -1,4 +1,4 @@ -/* $Id: rsisamb.c,v 1.15 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsisamb.c,v 1.16 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -79,7 +79,6 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms) rset_isamb_parms *pt = (rset_isamb_parms *) parms; struct rset_isamb_info *info; - ct->flags |= RSET_FLAG_VOLATILE; info = (struct rset_isamb_info *) xmalloc (sizeof(*info)); info->is = pt->is; info->pos = pt->pos; diff --git a/rset/rsisamc.c b/rset/rsisamc.c index 6c26e89..681868b 100644 --- a/rset/rsisamc.c +++ b/rset/rsisamc.c @@ -1,4 +1,4 @@ -/* $Id: rsisamc.c,v 1.18 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsisamc.c,v 1.19 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -74,7 +74,6 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms) rset_isamc_parms *pt = (rset_isamc_parms *) parms; struct rset_isamc_info *info; - ct->flags |= RSET_FLAG_VOLATILE; info = (struct rset_isamc_info *) xmalloc (sizeof(*info)); info->is = pt->is; info->pos = pt->pos; diff --git a/rset/rsisams.c b/rset/rsisams.c index e93674d..0ad55d5 100644 --- a/rset/rsisams.c +++ b/rset/rsisams.c @@ -1,4 +1,4 @@ -/* $Id: rsisams.c,v 1.8 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsisams.c,v 1.9 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -68,7 +68,6 @@ static void *r_create(RSET ct, const struct rset_control *sel, void *parms) rset_isams_parms *pt = (struct rset_isams_parms *) parms; struct rset_isams_info *info; - ct->flags |= RSET_FLAG_VOLATILE; info = (struct rset_isams_info *) xmalloc (sizeof(*info)); info->is = pt->is; info->pos = pt->pos; diff --git a/rset/rsmultior.c b/rset/rsmultior.c index 38c0d94..77d2aca 100644 --- a/rset/rsmultior.c +++ b/rset/rsmultior.c @@ -1,4 +1,4 @@ -/* $Id: rsmultior.c,v 1.4 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsmultior.c,v 1.5 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -223,9 +223,6 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) { rset_multior_parms *r_parms = (rset_multior_parms *) parms; struct rset_multior_info *info; - - ct->flags |= RSET_FLAG_VOLATILE; - /* FIXME - Remove the whole flags thing, from all rsets */ info = (struct rset_multior_info *) xmalloc (sizeof(*info)); info->key_size = r_parms->key_size; assert (info->key_size > 1); diff --git a/rset/rsprox.c b/rset/rsprox.c index 0932c9d..9c05a9f 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,4 +1,4 @@ -/* $Id: rsprox.c,v 1.9 2004-08-20 14:44:46 heikki Exp $ +/* $Id: rsprox.c,v 1.10 2004-08-23 12:38:53 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -79,14 +79,6 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) { rset_prox_parms *prox_parms = (rset_prox_parms *) parms; struct rset_prox_info *info; - int i; - /* - char prox_term[512]; - int length_prox_term = 0; - zint min_nn = 10000000; - const char *flags = NULL; - int term_type = 0; -*/ info = (struct rset_prox_info *) xmalloc (sizeof(*info)); memcpy(&info->p, prox_parms, sizeof(struct rset_prox_parms)); @@ -95,35 +87,6 @@ static void *r_create (RSET ct, const struct rset_control *sel, void *parms) memcpy(info->p.rset, prox_parms->rset, info->p.rset_no * sizeof(*info->p.rset)); info->rfd_list = NULL; - - for (i = 0; ip.rset_no; i++) - if (rset_is_volatile(info->p.rset[i])) - ct->flags |= RSET_FLAG_VOLATILE; - -#if 0 /* This should all be about terms! */ - *prox_term = '\0'; - for (i = 0; ip.rset_no; i++) - { - int j; - for (j = 0; j < info->p.rset[i]->no_rset_terms; j++) - { - const char *nflags = info->p.rset[i]->rset_terms[j]->flags; - char *term = info->p.rset[i]->rset_terms[j]->name; - int lterm = strlen(term); - if (lterm + length_prox_term < sizeof(prox_term)-1) - { - if (length_prox_term) - prox_term[length_prox_term++] = ' '; - strcpy (prox_term + length_prox_term, term); - length_prox_term += lterm; - } - if (min_nn > info->p.rset[i]->rset_terms[j]->nn) - min_nn = info->p.rset[i]->rset_terms[j]->nn; - flags = nflags; - term_type = info->p.rset[i]->rset_terms[j]->type; - } - } -#endif return info; } -- 1.7.10.4