-/* $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
const void *untilbuf);
void rset_default_pos(RSFD rfd, double *current, double *total);
+/*
struct rset_term {
char *name;
zint nn;
zint count;
int type;
};
+*/
typedef struct rset
{
const struct rset_control *control;
- int flags;
int count;
void *buf;
} rset;
/* 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
}
-/* $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
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;
-/* $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
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;
-/* $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
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;
-/* $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
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;
-/* $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
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;
-/* $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
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;
-/* $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
{
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);
-/* $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
{
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));
memcpy(info->p.rset, prox_parms->rset,
info->p.rset_no * sizeof(*info->p.rset));
info->rfd_list = NULL;
-
- for (i = 0; i<info->p.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; i<info->p.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;
}