From e127268c91736bf5a116cbc24653da4b845ca046 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 29 Oct 1996 13:55:18 +0000 Subject: [PATCH] Include of zebrautl.h instead of alexutil.h. --- bfile/bfile.c | 7 +++++-- bfile/cfile.c | 7 +++++-- bfile/commit.c | 7 +++++-- bfile/mfile.c | 7 +++++-- dfa/Makefile | 14 +++++++------- dfa/agrep.c | 7 +++++-- dfa/bset.c | 7 +++++-- dfa/dfa.c | 11 +++++++---- dfa/grepper.c | 7 +++++-- dfa/imalloc.c | 7 +++++-- dfa/lexer.c | 7 +++++-- dfa/readfile.c | 7 +++++-- dfa/set.c | 6 ++++-- dfa/states.c | 6 ++++-- isam/Makefile | 8 ++++---- isam/isam.c | 7 +++++-- isam/isutil.c | 7 +++++-- isam/memory.c | 7 +++++-- isam/physical.c | 6 +++++- rset/Makefile | 4 ++-- rset/rsbool.c | 7 +++++-- rset/rset.c | 7 +++++-- rset/rsisam.c | 7 +++++-- rset/rsnull.c | 7 +++++-- rset/rsrel.c | 7 +++++-- rset/rssbool.c | 7 +++++-- 26 files changed, 128 insertions(+), 60 deletions(-) diff --git a/bfile/bfile.c b/bfile/bfile.c index ccaf537..d1a684a 100644 --- a/bfile/bfile.c +++ b/bfile/bfile.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: bfile.c,v $ - * Revision 1.20 1996-03-26 15:59:04 adam + * Revision 1.21 1996-10-29 13:56:13 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.20 1996/03/26 15:59:04 adam * The directory of the shadow table file can be specified by the new * bf_lockDir call. * @@ -71,7 +74,7 @@ #include #include -#include +#include #include #include "cfile.h" diff --git a/bfile/cfile.c b/bfile/cfile.c index cb3c714..b14fef8 100644 --- a/bfile/cfile.c +++ b/bfile/cfile.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: cfile.c,v $ - * Revision 1.17 1996-04-19 16:49:00 adam + * Revision 1.18 1996-10-29 13:56:15 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.17 1996/04/19 16:49:00 adam * Minor changes. * * Revision 1.16 1996/04/19 16:23:47 adam @@ -66,7 +69,7 @@ #include #include -#include +#include #include #include "cfile.h" diff --git a/bfile/commit.c b/bfile/commit.c index 4539426..cf8afff 100644 --- a/bfile/commit.c +++ b/bfile/commit.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: commit.c,v $ - * Revision 1.12 1996-04-24 13:29:16 adam + * Revision 1.13 1996-10-29 13:56:16 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.12 1996/04/24 13:29:16 adam * Work on optimized on commit operation. * * Revision 1.11 1996/04/23 12:36:41 adam @@ -48,7 +51,7 @@ #include #include -#include +#include #include #include "cfile.h" diff --git a/bfile/mfile.c b/bfile/mfile.c index dfd60d2..750a3b3 100644 --- a/bfile/mfile.c +++ b/bfile/mfile.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: mfile.c,v $ - * Revision 1.20 1996-05-14 12:10:16 quinn + * Revision 1.21 1996-10-29 13:56:18 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.20 1996/05/14 12:10:16 quinn * Bad areadef scan * * Revision 1.19 1996/05/01 07:16:30 quinn @@ -81,7 +84,7 @@ #include #include -#include +#include #include static MFile_area_struct *open_areas = 0; diff --git a/dfa/Makefile b/dfa/Makefile index 610941f..84ee8cc 100644 --- a/dfa/Makefile +++ b/dfa/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994-1996, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.14 1996-05-14 11:33:40 adam Exp $ +# $Id: Makefile,v 1.15 1996-10-29 13:57:17 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -22,17 +22,17 @@ all: $(LIB) alll: $(LIB) $(TPROG1) $(TPROG2) $(TPROG3) -$(TPROG1): $(TPROG1).o $(LIB) ../lib/alexutil.a +$(TPROG1): $(TPROG1).o $(LIB) ../lib/zebrautl.a $(CC) $(CFLAGS) -o $(TPROG1) $(TPROG1).o $(LIB) \ - ../lib/alexutil.a $(YAZLIB) + ../lib/zebrautl.a $(YAZLIB) -$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/alexutil.a +$(TPROG2): $(TPROG2).o readfile.o $(LIB) ../lib/zebrautl.a $(CC) $(CFLAGS) -o $(TPROG2) $(TPROG2).o readfile.o $(LIB) \ - ../lib/alexutil.a $(YAZLIB) + ../lib/zebrautl.a $(YAZLIB) -$(TPROG3): $(TPROG3).o $(LIB) ../lib/alexutil.a +$(TPROG3): $(TPROG3).o $(LIB) ../lib/zebrautl.a $(CC) $(CFLAGS) -o $(TPROG3) $(TPROG3).o $(LIB) $(YAZLIB) \ - ../lib/alexutil.a $(YAZLIB) + ../lib/zebrautl.a $(YAZLIB) $(LIB): $(PO) rm -f $(LIB) diff --git a/dfa/agrep.c b/dfa/agrep.c index 119f7ed..f63e7da 100644 --- a/dfa/agrep.c +++ b/dfa/agrep.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: agrep.c,v $ - * Revision 1.8 1996-01-08 09:09:16 adam + * Revision 1.9 1996-10-29 13:57:18 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.8 1996/01/08 09:09:16 adam * Function dfa_parse got 'const' string argument. * New functions to define char mappings made public. * @@ -44,7 +47,7 @@ #include -#include +#include #include #include "imalloc.h" diff --git a/dfa/bset.c b/dfa/bset.c index e514b4f..016c0bd 100644 --- a/dfa/bset.c +++ b/dfa/bset.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: bset.c,v $ - * Revision 1.3 1995-09-04 12:33:25 adam + * Revision 1.4 1996-10-29 13:57:20 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.3 1995/09/04 12:33:25 adam * Various cleanup. YAZ util used instead. * * Revision 1.2 1995/01/24 16:00:21 adam @@ -22,7 +25,7 @@ #include #include -#include +#include #include #include "imalloc.h" diff --git a/dfa/dfa.c b/dfa/dfa.c index 5504f41..276ca06 100644 --- a/dfa/dfa.c +++ b/dfa/dfa.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: dfa.c,v $ - * Revision 1.13 1996-06-17 14:24:08 adam + * Revision 1.14 1996-10-29 13:57:22 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.13 1996/06/17 14:24:08 adam * Bug fix: read_charset didn't handle character mapping. * * Revision 1.12 1996/06/04 10:20:02 adam @@ -54,7 +57,7 @@ #include #include -#include +#include #include "dfap.h" #include "imalloc.h" @@ -455,7 +458,7 @@ static int read_charset (void) static int map_l_char (void) { char **mapto; - const char *cp0 = expr_ptr-1; + const char *cp0 = (const char *) (expr_ptr-1); int i = 0, len = strlen(cp0); if (cp0[0] == 1 && cp0[1]) @@ -470,7 +473,7 @@ static int map_l_char (void) mapto = (*parse_info->cmap) (&cp0, len); assert (mapto); - expr_ptr = cp0; + expr_ptr = (const unsigned char *) cp0; look_ch = mapto[i][0]; logf (LOG_DEBUG, "map from %c to %d", expr_ptr[-1], look_ch); return L_CHAR; diff --git a/dfa/grepper.c b/dfa/grepper.c index cefb2f6..1340247 100644 --- a/dfa/grepper.c +++ b/dfa/grepper.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: grepper.c,v $ - * Revision 1.6 1996-01-08 09:09:20 adam + * Revision 1.7 1996-10-29 13:57:24 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.6 1996/01/08 09:09:20 adam * Function dfa_parse got 'const' string argument. * New functions to define char mappings made public. * @@ -31,7 +34,7 @@ #include #include -#include +#include #include #include "imalloc.h" diff --git a/dfa/imalloc.c b/dfa/imalloc.c index 952eb7a..43a6657 100644 --- a/dfa/imalloc.c +++ b/dfa/imalloc.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: imalloc.c,v $ - * Revision 1.5 1996-05-14 11:33:41 adam + * Revision 1.6 1996-10-29 13:57:25 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.5 1996/05/14 11:33:41 adam * MEMDEBUG turned off by default. * * Revision 1.4 1995/09/04 12:33:26 adam @@ -25,7 +28,7 @@ #include #include -#include +#include #include "imalloc.h" #if MEMDEBUG diff --git a/dfa/lexer.c b/dfa/lexer.c index 9684c71..2d0fc5e 100644 --- a/dfa/lexer.c +++ b/dfa/lexer.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: lexer.c,v $ - * Revision 1.9 1996-05-14 11:33:41 adam + * Revision 1.10 1996-10-29 13:57:27 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.9 1996/05/14 11:33:41 adam * MEMDEBUG turned off by default. * * Revision 1.8 1995/09/28 09:18:54 adam @@ -45,7 +48,7 @@ #include #include -#include +#include #include #include "imalloc.h" #include "lexer.h" diff --git a/dfa/readfile.c b/dfa/readfile.c index 9a83df3..b36c6ab 100644 --- a/dfa/readfile.c +++ b/dfa/readfile.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: readfile.c,v $ - * Revision 1.6 1996-01-08 09:09:21 adam + * Revision 1.7 1996-10-29 13:57:28 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.6 1996/01/08 09:09:21 adam * Function dfa_parse got 'const' string argument. * New functions to define char mappings made public. * @@ -34,7 +37,7 @@ #include #include -#include +#include #include #include "lexer.h" diff --git a/dfa/set.c b/dfa/set.c index 3c3f832..285fe55 100644 --- a/dfa/set.c +++ b/dfa/set.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: set.c,v $ - * Revision 1.4 1995-09-04 12:33:27 adam + * Revision 1.5 1996-10-29 13:57:29 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.4 1995/09/04 12:33:27 adam * Various cleanup. YAZ util used instead. * * Revision 1.3 1995/02/06 10:12:55 adam @@ -25,7 +28,6 @@ #include #include -#include #include #include "imalloc.h" diff --git a/dfa/states.c b/dfa/states.c index 5af1da6..5af3cae 100644 --- a/dfa/states.c +++ b/dfa/states.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: states.c,v $ - * Revision 1.4 1995-09-04 12:33:28 adam + * Revision 1.5 1996-10-29 13:57:31 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.4 1995/09/04 12:33:28 adam * Various cleanup. YAZ util used instead. * * Revision 1.3 1995/01/25 11:30:51 adam @@ -26,7 +29,6 @@ #include #include -#include #include "dfap.h" #include "imalloc.h" diff --git a/isam/Makefile b/isam/Makefile index a6d9736..21fa8c9 100644 --- a/isam/Makefile +++ b/isam/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.19 1996-05-22 08:26:50 adam Exp $ +# $Id: Makefile,v 1.20 1996-10-29 13:56:51 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -21,15 +21,15 @@ alll: $(LIB) # isam-test issh test: test.c $(LIB) $(CC) -g -o test -I../include test.c \ - ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a $(YAZLIB) + ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) isam-test: isam-test.c $(LIB) $(CC) -g -o isam-test -I../include isam-test.c \ - ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a $(YAZLIB) + ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) issh: issh.c $(LIB) $(CC) -g -o issh $(INCLUDE) issh.c \ - ../lib/isam.a ../lib/bfile.a ../lib/alexutil.a $(YAZLIB) + ../lib/isam.a ../lib/bfile.a ../lib/zebrautl.a $(YAZLIB) #$(TPROG): $(TPROG).o $(LIB) # $(CC) -o $(TPROG) $(TPROG).o $(LIB) diff --git a/isam/isam.c b/isam/isam.c index 91ad2cb..380ccec 100644 --- a/isam/isam.c +++ b/isam/isam.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: isam.c,v $ - * Revision 1.21 1996-03-29 14:11:47 quinn + * Revision 1.22 1996-10-29 13:56:53 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.21 1996/03/29 14:11:47 quinn * Change to is_merge * * Revision 1.20 1996/03/19 13:14:57 quinn @@ -73,7 +76,7 @@ #include #include -#include +#include #include #include #include diff --git a/isam/isutil.c b/isam/isutil.c index d5aa803..2612f38 100644 --- a/isam/isutil.c +++ b/isam/isutil.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: isutil.c,v $ - * Revision 1.2 1995-09-04 12:33:46 adam + * Revision 1.3 1996-10-29 13:56:55 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.2 1995/09/04 12:33:46 adam * Various cleanup. YAZ util used instead. * * Revision 1.1 1994/09/12 08:02:13 quinn @@ -41,7 +44,7 @@ char *strconcat(const char *s1, ...) int is_default_cmp(const void *k1, const void *k2) { - SYSNO b1, b2; + int b1, b2; memcpy(&b1, k1, sizeof(b1)); memcpy(&b2, k2, sizeof(b2)); diff --git a/isam/memory.c b/isam/memory.c index 027b72c..c6b7ed0 100644 --- a/isam/memory.c +++ b/isam/memory.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: memory.c,v $ - * Revision 1.13 1996-03-20 13:29:16 quinn + * Revision 1.14 1996-10-29 13:56:56 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.13 1996/03/20 13:29:16 quinn * Bug-fix * * Revision 1.12 1996/03/11 14:52:23 quinn @@ -54,7 +57,7 @@ #include #include -#include +#include #include int is_mbuf_size[3] = { 0, 1024, 4096 }; diff --git a/isam/physical.c b/isam/physical.c index ebc4687..f10f23b 100644 --- a/isam/physical.c +++ b/isam/physical.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: physical.c,v $ - * Revision 1.12 1996-03-20 16:17:11 quinn + * Revision 1.13 1996-10-29 13:56:57 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.12 1996/03/20 16:17:11 quinn * Bug hunting * * Revision 1.11 1996/03/20 13:29:17 quinn @@ -50,6 +53,7 @@ #include #include +#include #include static int is_freestore_alloc(ISAM is, int type) diff --git a/rset/Makefile b/rset/Makefile index a8de96a..5ca63d5 100644 --- a/rset/Makefile +++ b/rset/Makefile @@ -1,7 +1,7 @@ # Copyright (C) 1994-1996, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.12 1996-05-22 08:26:56 adam Exp $ +# $Id: Makefile,v 1.13 1996-10-29 13:55:18 adam Exp $ SHELL=/bin/sh RANLIB=ranlib @@ -13,7 +13,7 @@ INCLUDE=-I../include $(YAZINC) DEFS=$(INCLUDE) LIB=../lib/rset.a PROG= -PO=rset.o rstemp.o rsisam.o rsnull.o rsbool.o rssbool.o rsrel.o +PO=rset.o rstemp.o rsisam.o rsnull.o rsbool.o rssbool.o rsrel.o rsisamc.o CPP=$(CC) -E all: $(LIB) diff --git a/rset/rsbool.c b/rset/rsbool.c index df2c5e4..2a72743 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rsbool.c,v $ - * Revision 1.9 1995-12-11 09:15:22 adam + * Revision 1.10 1996-10-29 13:55:20 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.9 1995/12/11 09:15:22 adam * New set types: sand/sor/snot - ranked versions of and/or/not in * ranked/semi-ranked result sets. * Note: the snot not finished yet. @@ -45,7 +48,7 @@ #include #include -#include +#include static void *r_create(const struct rset_control *sel, void *parms, int *flags); diff --git a/rset/rset.c b/rset/rset.c index d6e2041..b86b981 100644 --- a/rset/rset.c +++ b/rset/rset.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rset.c,v $ - * Revision 1.8 1995-12-11 09:15:23 adam + * Revision 1.9 1996-10-29 13:55:21 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.8 1995/12/11 09:15:23 adam * New set types: sand/sor/snot - ranked versions of and/or/not in * ranked/semi-ranked result sets. * Note: the snot not finished yet. @@ -38,7 +41,7 @@ */ #include -#include +#include #include diff --git a/rset/rsisam.c b/rset/rsisam.c index 2bdd745..9eb27cc 100644 --- a/rset/rsisam.c +++ b/rset/rsisam.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rsisam.c,v $ - * Revision 1.14 1995-12-11 09:15:24 adam + * Revision 1.15 1996-10-29 13:55:22 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.14 1995/12/11 09:15:24 adam * New set types: sand/sor/snot - ranked versions of and/or/not in * ranked/semi-ranked result sets. * Note: the snot not finished yet. @@ -56,7 +59,7 @@ #include #include #include -#include +#include static void *r_create(const struct rset_control *sel, void *parms, int *flags); diff --git a/rset/rsnull.c b/rset/rsnull.c index fd98d30..79613d8 100644 --- a/rset/rsnull.c +++ b/rset/rsnull.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rsnull.c,v $ - * Revision 1.7 1995-12-11 09:15:25 adam + * Revision 1.8 1996-10-29 13:55:24 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.7 1995/12/11 09:15:25 adam * New set types: sand/sor/snot - ranked versions of and/or/not in * ranked/semi-ranked result sets. * Note: the snot not finished yet. @@ -37,7 +40,7 @@ #include #include -#include +#include static void *r_create(const struct rset_control *sel, void *parms, int *flags); diff --git a/rset/rsrel.c b/rset/rsrel.c index 54b062e..8bd718d 100644 --- a/rset/rsrel.c +++ b/rset/rsrel.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rsrel.c,v $ - * Revision 1.12 1996-10-08 13:00:40 adam + * Revision 1.13 1996-10-29 13:55:26 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.12 1996/10/08 13:00:40 adam * Bug fix: result sets with ranked operands in boolean operations weren't * sorted. * @@ -52,7 +55,7 @@ #include #include -#include +#include static void *r_create(const struct rset_control *sel, void *parms, int *flags); diff --git a/rset/rssbool.c b/rset/rssbool.c index 65ec2c9..235b104 100644 --- a/rset/rssbool.c +++ b/rset/rssbool.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rssbool.c,v $ - * Revision 1.3 1996-10-08 13:00:41 adam + * Revision 1.4 1996-10-29 13:55:27 adam + * Include of zebrautl.h instead of alexutil.h. + * + * Revision 1.3 1996/10/08 13:00:41 adam * Bug fix: result sets with ranked operands in boolean operations weren't * sorted. * @@ -24,7 +27,7 @@ #include #include -#include +#include static void *r_create_and(const struct rset_control *sel, void *parms, int *flags); -- 1.7.10.4