From 5b53087fa5a07ff89d34cf3bf3bc1b28809f05c2 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 5 Dec 2000 23:00:25 +0000 Subject: [PATCH] Add directory to all includes. --- lib/Makefile | 2 +- lib/alloc.c | 2 +- lib/alloc_str.c | 2 +- lib/ctmatch.c | 4 ++-- lib/db-emul.c | 4 ++-- lib/db-rebuild.c | 2 +- lib/db-test.c | 4 ++-- lib/db.c | 10 +++++----- lib/fastbuf.c | 4 ++-- lib/fb-file.c | 6 +++--- lib/fb-mem.c | 4 ++-- lib/lib.h | 2 +- lib/lists.c | 2 +- lib/lists.h | 2 +- lib/log.c | 2 +- lib/log2.c | 2 +- lib/md5.c | 2 +- lib/md5hex.c | 4 ++-- lib/mmap.c | 2 +- lib/pagecache.c | 6 +++--- lib/patimatch.c | 6 +++--- lib/patmatch.c | 4 ++-- lib/pool.c | 4 ++-- lib/prime.c | 2 +- lib/random.c | 2 +- lib/realloc.c | 2 +- lib/regex.c | 2 +- lib/str_ctype.c | 4 ++-- lib/str_upper.c | 4 ++-- lib/temp.c | 2 +- lib/timer.c | 2 +- lib/url.c | 6 +++--- lib/wildmatch.c | 6 +++--- lib/wordsplit.c | 4 ++-- 34 files changed, 59 insertions(+), 59 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 03702091..af8fb348 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,7 +6,7 @@ PROGS+=obj/lib/db-test obj/lib/db-rebuild SHLIB_OBJS=alloc.o alloc_str.o ctmatch.o db.o fastbuf.o fb-file.o fb-mem.o lists.o \ log.o log2.o md5.o md5hex.o mmap.o pagecache.o patimatch.o patmatch.o pool.o \ prime.o random.o realloc.o regex.o temp.o timer.o url.o wildmatch.o \ - wordsplit.o + wordsplit.o str_ctype.o str_upper.o obj/lib/libsh.a: $(addprefix obj/lib/,$(SHLIB_OBJS)) diff --git a/lib/alloc.c b/lib/alloc.c index c72851ee..127e63ca 100644 --- a/lib/alloc.c +++ b/lib/alloc.c @@ -7,7 +7,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" void * xmalloc(uns size) diff --git a/lib/alloc_str.c b/lib/alloc_str.c index 7c9f92de..0153887e 100644 --- a/lib/alloc_str.c +++ b/lib/alloc_str.c @@ -7,7 +7,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" byte * stralloc(byte *s) diff --git a/lib/ctmatch.c b/lib/ctmatch.c index ffa1385c..269ab83d 100644 --- a/lib/ctmatch.c +++ b/lib/ctmatch.c @@ -6,8 +6,8 @@ #include -#include "lib.h" -#include "string.h" +#include "lib/lib.h" +#include "lib/chartype.h" int match_ct_patt(byte *p, byte *t) diff --git a/lib/db-emul.c b/lib/db-emul.c index 533c996f..f6cc65ca 100644 --- a/lib/db-emul.c +++ b/lib/db-emul.c @@ -8,8 +8,8 @@ #include #include -#include "lib.h" -#include "db.h" +#include "lib/lib.h" +#include "lib/db.h" #include diff --git a/lib/db-rebuild.c b/lib/db-rebuild.c index a0ad1585..3ab673fc 100644 --- a/lib/db-rebuild.c +++ b/lib/db-rebuild.c @@ -11,7 +11,7 @@ #include #include -#include "db.c" +#include "lib/db.c" int main(int argc, char **argv) diff --git a/lib/db-test.c b/lib/db-test.c index b1694223..99139eb3 100644 --- a/lib/db-test.c +++ b/lib/db-test.c @@ -5,10 +5,10 @@ */ #if 1 -#include "db.c" +#include "lib/db.c" #define NAME "SDBM" #else -#include "db-emul.c" +#include "lib/db-emul.c" #define NAME "GDBM" #endif diff --git a/lib/db.c b/lib/db.c index fd8a8c0e..c33ca6f5 100644 --- a/lib/db.c +++ b/lib/db.c @@ -25,11 +25,11 @@ #include #include -#include "lib.h" -#include "lfs.h" -#include "pagecache.h" -#include "db.h" -#include "db_internal.h" +#include "lib/lib.h" +#include "lib/lfs.h" +#include "lib/pagecache.h" +#include "lib/db.h" +#include "lib/db_internal.h" struct sdbm * sdbm_open(struct sdbm_options *o) diff --git a/lib/fastbuf.c b/lib/fastbuf.c index 1a5544fb..42506f76 100644 --- a/lib/fastbuf.c +++ b/lib/fastbuf.c @@ -7,8 +7,8 @@ #include #include -#include "lib.h" -#include "fastbuf.h" +#include "lib/lib.h" +#include "lib/fastbuf.h" void bclose(struct fastbuf *f) { diff --git a/lib/fb-file.c b/lib/fb-file.c index c111ab75..07b4ec5d 100644 --- a/lib/fb-file.c +++ b/lib/fb-file.c @@ -9,9 +9,9 @@ #include #include -#include "lib.h" -#include "fastbuf.h" -#include "lfs.h" +#include "lib/lib.h" +#include "lib/fastbuf.h" +#include "lib/lfs.h" static int bfd_refill(struct fastbuf *f) diff --git a/lib/fb-mem.c b/lib/fb-mem.c index 4248c2fd..f582e2e3 100644 --- a/lib/fb-mem.c +++ b/lib/fb-mem.c @@ -7,8 +7,8 @@ #include #include -#include "lib.h" -#include "fastbuf.h" +#include "lib/lib.h" +#include "lib/fastbuf.h" struct memstream { unsigned blocksize; diff --git a/lib/lib.h b/lib/lib.h index 72337d93..48d49ec9 100644 --- a/lib/lib.h +++ b/lib/lib.h @@ -7,7 +7,7 @@ #ifndef _SHERLOCK_LIB_H #define _SHERLOCK_LIB_H -#include +#include "lib/config.h" /* Ugly structure handling macros */ diff --git a/lib/lists.c b/lib/lists.c index 8f4f0b4b..9f783de9 100644 --- a/lib/lists.c +++ b/lib/lists.c @@ -7,7 +7,7 @@ #include #define _SHERLOCK_LISTS_C -#include "lists.h" +#include "lib/lists.h" LIST_INLINE void add_tail(list *l, node *n) diff --git a/lib/lists.h b/lib/lists.h index 48b7de99..ce03656b 100644 --- a/lib/lists.h +++ b/lib/lists.h @@ -38,7 +38,7 @@ void init_list(list *); void insert_node(node *, node *); #if !defined(_SHERLOCK_LISTS_C) && defined(__GNUC__) -#define LIST_INLINE extern inline +#define LIST_INLINE static inline #include "lib/lists.c" #undef LIST_INLINE #else diff --git a/lib/log.c b/lib/log.c index 78d5089f..994522dc 100644 --- a/lib/log.c +++ b/lib/log.c @@ -11,7 +11,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" static byte *progname = "???"; static pid_t pid; diff --git a/lib/log2.c b/lib/log2.c index 5ba25776..da6cf8ec 100644 --- a/lib/log2.c +++ b/lib/log2.c @@ -6,7 +6,7 @@ #include -#include "lib.h" +#include "lib/lib.h" #undef log2 diff --git a/lib/md5.c b/lib/md5.c index d4f8535b..32d26020 100644 --- a/lib/md5.c +++ b/lib/md5.c @@ -16,7 +16,7 @@ */ #include /* for memcpy() */ -#include "md5.h" +#include "lib/md5.h" #ifndef HIGHFIRST #define byteReverse(buf, len) /* Nothing */ diff --git a/lib/md5hex.c b/lib/md5hex.c index 143168db..2b8d2d88 100644 --- a/lib/md5hex.c +++ b/lib/md5hex.c @@ -9,8 +9,8 @@ #include #include -#include "lib.h" -#include "string.h" +#include "lib/lib.h" +#include "lib/chartype.h" void md5_to_hex(byte *s, byte *d) diff --git a/lib/mmap.c b/lib/mmap.c index 23f69e6e..46f5cd3a 100644 --- a/lib/mmap.c +++ b/lib/mmap.c @@ -10,7 +10,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #ifndef MAP_FAILED #define MAP_FAILED ((void *)-1L) diff --git a/lib/pagecache.c b/lib/pagecache.c index f194fc5c..9420ab31 100644 --- a/lib/pagecache.c +++ b/lib/pagecache.c @@ -10,9 +10,9 @@ #include #include -#include "lib.h" -#include "pagecache.h" -#include "lfs.h" +#include "lib/lib.h" +#include "lib/pagecache.h" +#include "lib/lfs.h" struct page_cache { list free_pages; /* LRU queue of free non-dirty pages */ diff --git a/lib/patimatch.c b/lib/patimatch.c index fa651b06..e799f694 100644 --- a/lib/patimatch.c +++ b/lib/patimatch.c @@ -7,10 +7,10 @@ #include #include -#include "lib.h" -#include "string.h" +#include "lib/lib.h" +#include "lib/chartype.h" #define Convert(x) Cupcase(x) #define MATCH_FUNC_NAME match_pattern_nocase -#include "patmatch.h" +#include "lib/patmatch.h" diff --git a/lib/patmatch.c b/lib/patmatch.c index 53a0710a..df73de57 100644 --- a/lib/patmatch.c +++ b/lib/patmatch.c @@ -7,9 +7,9 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #define Convert(x) (x) #define MATCH_FUNC_NAME match_pattern -#include "patmatch.h" +#include "lib/patmatch.h" diff --git a/lib/pool.c b/lib/pool.c index 7fc635d3..623f0517 100644 --- a/lib/pool.c +++ b/lib/pool.c @@ -7,8 +7,8 @@ #include #include -#include "lib.h" -#include "pools.h" +#include "lib/lib.h" +#include "lib/pools.h" struct memchunk { struct memchunk *next; diff --git a/lib/prime.c b/lib/prime.c index fe47ecd3..877442da 100644 --- a/lib/prime.c +++ b/lib/prime.c @@ -7,7 +7,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" static int /* Sequential search */ __isprime(uns x) /* We know x != 2 && x != 3 */ diff --git a/lib/random.c b/lib/random.c index 01adda5b..57516fd2 100644 --- a/lib/random.c +++ b/lib/random.c @@ -7,7 +7,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" uns random_max(uns max) diff --git a/lib/realloc.c b/lib/realloc.c index 78c6b19b..3ee75aa8 100644 --- a/lib/realloc.c +++ b/lib/realloc.c @@ -7,7 +7,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" void * xrealloc(void *old, uns size) diff --git a/lib/regex.c b/lib/regex.c index 888f36b9..2df8fd04 100644 --- a/lib/regex.c +++ b/lib/regex.c @@ -9,7 +9,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" #define INITIAL_MEM 1024 /* Initial space allocated for each pattern */ diff --git a/lib/str_ctype.c b/lib/str_ctype.c index 773d7843..45d7191d 100644 --- a/lib/str_ctype.c +++ b/lib/str_ctype.c @@ -4,10 +4,10 @@ * (c) 1998 Martin Mares, */ -#include "string.h" +#include "lib/chartype.h" unsigned char _c_cat[256] = { #define CHAR(code,upper,unacc,acc,cat) cat, -#include "charmap.h" +#include "lib/charmap.h" #undef CHAR }; diff --git a/lib/str_upper.c b/lib/str_upper.c index 2742cd4a..fa99e366 100644 --- a/lib/str_upper.c +++ b/lib/str_upper.c @@ -4,10 +4,10 @@ * (c) 1997 Martin Mares, */ -#include "string.h" +#include "lib/chartype.h" unsigned char _c_upper[256] = { #define CHAR(code,upper,unacc,acc,cat) upper, -#include "charmap.h" +#include "lib/charmap.h" #undef CHAR }; diff --git a/lib/temp.c b/lib/temp.c index 0b754c10..175977e9 100644 --- a/lib/temp.c +++ b/lib/temp.c @@ -9,7 +9,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" u32 temprand(uns key) diff --git a/lib/timer.c b/lib/timer.c index 7a18583b..80294518 100644 --- a/lib/timer.c +++ b/lib/timer.c @@ -8,7 +8,7 @@ #include #include -#include "lib.h" +#include "lib/lib.h" static struct timeval last_tv; diff --git a/lib/url.c b/lib/url.c index 480ba180..e3f431ad 100644 --- a/lib/url.c +++ b/lib/url.c @@ -8,9 +8,9 @@ #include #include -#include "lib.h" -#include "url.h" -#include "string.h" +#include "lib/lib.h" +#include "lib/url.h" +#include "lib/chartype.h" /* Escaping and de-escaping */ diff --git a/lib/wildmatch.c b/lib/wildmatch.c index fbc9bdb3..9bccae19 100644 --- a/lib/wildmatch.c +++ b/lib/wildmatch.c @@ -9,9 +9,9 @@ #include #include -#include "lib.h" -#include "pools.h" -#include "wildmatch.h" +#include "lib/lib.h" +#include "lib/pools.h" +#include "lib/wildmatch.h" #define MAX_STATES 32 /* Must be <= 32, state 0 is reserved, state 1 is initial */ #define MAX_CACHED 256 /* Maximum number of cached DFA states */ diff --git a/lib/wordsplit.c b/lib/wordsplit.c index fe657fc7..e79812d1 100644 --- a/lib/wordsplit.c +++ b/lib/wordsplit.c @@ -6,8 +6,8 @@ #include -#include "lib.h" -#include "string.h" +#include "lib/lib.h" +#include "lib/chartype.h" int wordsplit(byte *src, byte **dst, uns max) -- 2.39.2