From fa7aa6d9457616ce28f97c83eaa616d0ff276870 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sat, 11 Feb 2012 21:29:31 +0100 Subject: [PATCH] Use #include instead of "ucw/..." (and similarly for the other libs) --- TODO | 4 ++ charset/charconv.c | 32 +++++++------- charset/cs2cs.c | 2 +- charset/fb-charconv.c | 8 ++-- charset/mp-charconv.c | 4 +- charset/mp-charconv.h | 4 +- charset/setnames.c | 4 +- charset/stk-charconv.c | 4 +- charset/stk-charconv.h | 2 +- charset/tocat.c | 6 +-- charset/toligatures.c | 6 +-- charset/tolower.c | 6 +-- charset/toupper.c | 6 +-- charset/unaccent.c | 6 +-- free/libs/examples/external/test.c | 2 +- free/libs/examples/internal/test.c | 2 +- images/color-tool.c | 6 +-- images/color.c | 68 +++++++++++++++--------------- images/color.h | 2 +- images/config.c | 8 ++-- images/context.c | 8 ++-- images/dup-cmp.c | 10 ++--- images/dup-init.c | 12 +++--- images/image-dup-test.c | 14 +++--- images/image-sim-test.c | 16 +++---- images/image-test.c | 12 +++--- images/image-tool.c | 8 ++-- images/image.c | 12 +++--- images/images.h | 2 +- images/io-libjpeg.c | 22 +++++----- images/io-libmagick.c | 30 ++++++------- images/io-libpng.c | 14 +++--- images/io-libungif.c | 22 +++++----- images/io-main.c | 12 +++--- images/math.c | 4 +- images/object.c | 14 +++--- images/object.h | 2 +- images/scale-gen.h | 2 +- images/scale.c | 16 +++---- images/sig-cmp.c | 14 +++--- images/sig-dump.c | 6 +-- images/sig-init.c | 16 +++---- images/sig-seg.c | 14 +++--- images/sig-txt.c | 8 ++-- shxml/common.c | 12 +++--- shxml/dtd.c | 28 ++++++------ shxml/dtd.h | 2 +- shxml/internals.h | 4 +- shxml/parse.c | 20 ++++----- shxml/source.c | 16 +++---- shxml/xml-test.c | 10 ++--- shxml/xml.h | 8 ++-- ucw/adler32.c | 4 +- ucw/alloc.c | 2 +- ucw/alloc_str.c | 2 +- ucw/asio.c | 6 +-- ucw/asio.h | 4 +- ucw/asort-test.c | 4 +- ucw/base224.c | 4 +- ucw/base64.c | 6 +-- ucw/bbuf.c | 4 +- ucw/bbuf.h | 2 +- ucw/bigalloc.c | 2 +- ucw/binheap-test.c | 6 +-- ucw/bit-ffs.c | 4 +- ucw/bit-fls.c | 4 +- ucw/bitsig.c | 6 +-- ucw/char-cat.c | 6 +-- ucw/char-lower.c | 6 +-- ucw/char-upper.c | 6 +-- ucw/conf-alloc.c | 6 +-- ucw/conf-dump.c | 12 +++--- ucw/conf-input.c | 24 +++++------ ucw/conf-intr.c | 10 ++--- ucw/conf-journal.c | 10 ++--- ucw/conf-parse.c | 6 +-- ucw/conf-section.c | 14 +++--- ucw/conf-test.c | 10 ++--- ucw/eltpool.c | 6 +-- ucw/exitstatus.c | 4 +- ucw/fastbuf.c | 10 ++--- ucw/fb-atomic.c | 10 ++--- ucw/fb-buffer.c | 4 +- ucw/fb-direct.c | 14 +++--- ucw/fb-file.c | 6 +-- ucw/fb-grow.c | 6 +-- ucw/fb-limfd.c | 4 +- ucw/fb-mem.c | 4 +- ucw/fb-mmap.c | 8 ++-- ucw/fb-param.c | 10 ++--- ucw/fb-pool.c | 6 +-- ucw/fb-socket.c | 6 +-- ucw/fb-socket.h | 2 +- ucw/fb-temp.c | 6 +-- ucw/ff-binary.c | 6 +-- ucw/ff-binary.h | 4 +- ucw/ff-printf.c | 4 +- ucw/ff-stkstring.c | 4 +- ucw/ff-string.c | 8 ++-- ucw/ff-unicode.c | 10 ++--- ucw/ff-unicode.h | 4 +- ucw/gary.c | 4 +- ucw/getopt.c | 4 +- ucw/getopt.h | 2 +- ucw/getopt/getopt-sh.h | 2 +- ucw/hash-test.c | 16 +++---- ucw/hashfunc-test.c | 2 +- ucw/hashfunc.c | 6 +-- ucw/hashfunc.h | 2 +- ucw/hashtable.h | 14 +++--- ucw/io-careful.c | 4 +- ucw/io-mmap.c | 4 +- ucw/io-size.c | 4 +- ucw/io-sync.c | 4 +- ucw/ipaccess.c | 12 +++--- ucw/ipaccess.h | 2 +- ucw/kmp-test.c | 16 +++---- ucw/kmp.h | 14 +++--- ucw/lfs-test.c | 4 +- ucw/lib.h | 2 +- ucw/lizard-safe.c | 8 ++-- ucw/lizard-test.c | 10 ++--- ucw/lizard.c | 4 +- ucw/log-conf.c | 16 +++---- ucw/log-file.c | 12 +++--- ucw/log-internal.h | 2 +- ucw/log-stream.c | 8 ++-- ucw/log-syslog.c | 4 +- ucw/log.c | 8 ++-- ucw/log.h | 2 +- ucw/main-block.c | 4 +- ucw/main-rec.c | 4 +- ucw/main-test.c | 4 +- ucw/mainloop.c | 12 +++--- ucw/mainloop.h | 4 +- ucw/md5.c | 4 +- ucw/mempool-fmt.c | 4 +- ucw/mempool-str.c | 4 +- ucw/mempool.c | 6 +-- ucw/partmap.c | 6 +-- ucw/prime.c | 4 +- ucw/prime.h | 2 +- ucw/primetable.c | 6 +-- ucw/proctitle.c | 4 +- ucw/random.c | 2 +- ucw/realloc.c | 2 +- ucw/redblack-test.c | 6 +-- ucw/redblack.h | 2 +- ucw/regex.c | 8 ++-- ucw/res-eltpool.c | 6 +-- ucw/res-fd.c | 4 +- ucw/res-mem.c | 4 +- ucw/res-mempool.c | 6 +-- ucw/res-subpool.c | 4 +- ucw/resource.c | 8 ++-- ucw/resource.h | 4 +- ucw/runcmd.c | 4 +- ucw/semaphore.h | 2 +- ucw/sha1-hmac.c | 6 +-- ucw/sha1.c | 8 ++-- ucw/shell/config.c | 18 ++++---- ucw/shell/logger.c | 4 +- ucw/shell/logoutput.c | 14 +++--- ucw/sighandler.c | 6 +-- ucw/simple-lists.c | 8 ++-- ucw/simple-lists.h | 2 +- ucw/slists.c | 4 +- ucw/sorter/array.c | 10 ++--- ucw/sorter/array.h | 2 +- ucw/sorter/common.h | 2 +- ucw/sorter/config.c | 8 ++-- ucw/sorter/debug/radix-asio-test.c | 8 ++-- ucw/sorter/debug/radix-file-test.c | 6 +-- ucw/sorter/debug/retros.c | 10 ++--- ucw/sorter/govern.c | 10 ++--- ucw/sorter/s-fixint.h | 4 +- ucw/sorter/s-internal.h | 4 +- ucw/sorter/sbuck.c | 10 ++--- ucw/sorter/sort-test.c | 38 ++++++++--------- ucw/sorter/sorter.h | 14 +++--- ucw/stkstring.c | 6 +-- ucw/stkstring.h | 2 +- ucw/str-esc.c | 6 +-- ucw/str-fix.c | 4 +- ucw/str-hex.c | 6 +-- ucw/str-imatch.c | 6 +-- ucw/str-match.c | 4 +- ucw/str-match.h | 2 +- ucw/str-split.c | 6 +-- ucw/string.c | 4 +- ucw/strtonum-test.c | 6 +-- ucw/strtonum.c | 12 +++--- ucw/tbf.c | 4 +- ucw/tempfile.c | 12 +++--- ucw/threads-conf.c | 6 +-- ucw/threads.c | 4 +- ucw/threads.h | 2 +- ucw/timer.c | 2 +- ucw/trans.c | 8 ++-- ucw/trans.h | 2 +- ucw/trie-test.c | 10 ++--- ucw/trie.h | 4 +- ucw/unicode.c | 4 +- ucw/unicode.h | 2 +- ucw/url.c | 10 ++--- ucw/utils/basecode.c | 10 ++--- ucw/utils/daemon-helper.c | 2 +- ucw/utils/urltool.c | 8 ++-- ucw/wildmatch.c | 6 +-- ucw/workqueue.c | 8 ++-- ucw/workqueue.h | 4 +- 211 files changed, 791 insertions(+), 787 deletions(-) diff --git a/TODO b/TODO index e3413bc3..ff88ed25 100644 --- a/TODO +++ b/TODO @@ -2,3 +2,7 @@ - ipaccess: support IPv6 - lfs-test: generalize or kill - transactions: Unit tests +- libucw.pc: do not use -l if shared +- compile cstocs +- retros.c: sherlock.h +- remove excess inlines diff --git a/charset/charconv.c b/charset/charconv.c index bf431dd1..912db365 100644 --- a/charset/charconv.c +++ b/charset/charconv.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/unicode.h" -#include "ucw/unaligned.h" -#include "charset/charconv.h" -#include "charset/chartable.h" +#include +#include +#include +#include +#include void conv_init(struct conv_context *c) @@ -270,7 +270,7 @@ conv_std_to_utf8(struct conv_context *c) { #define CONV_READ_STD #define CONV_WRITE_UTF8 -#include "charset/charconv-gen.h" +#include } static int @@ -278,7 +278,7 @@ conv_utf8_to_std(struct conv_context *c) { #define CONV_READ_UTF8 #define CONV_WRITE_STD -#include "charset/charconv-gen.h" +#include } static int @@ -286,7 +286,7 @@ conv_std_to_utf16_be(struct conv_context *c) { #define CONV_READ_STD #define CONV_WRITE_UTF16_BE -#include "charset/charconv-gen.h" +#include } static int @@ -294,7 +294,7 @@ conv_utf16_be_to_std(struct conv_context *c) { #define CONV_READ_UTF16_BE #define CONV_WRITE_STD -#include "charset/charconv-gen.h" +#include } static int @@ -302,7 +302,7 @@ conv_std_to_utf16_le(struct conv_context *c) { #define CONV_READ_STD #define CONV_WRITE_UTF16_LE -#include "charset/charconv-gen.h" +#include } static int @@ -310,7 +310,7 @@ conv_utf16_le_to_std(struct conv_context *c) { #define CONV_READ_UTF16_LE #define CONV_WRITE_STD -#include "charset/charconv-gen.h" +#include } static int @@ -318,7 +318,7 @@ conv_utf8_to_utf16_be(struct conv_context *c) { #define CONV_READ_UTF8 #define CONV_WRITE_UTF16_BE -#include "charset/charconv-gen.h" +#include } static int @@ -326,7 +326,7 @@ conv_utf16_be_to_utf8(struct conv_context *c) { #define CONV_READ_UTF16_BE #define CONV_WRITE_UTF8 -#include "charset/charconv-gen.h" +#include } static int @@ -334,7 +334,7 @@ conv_utf8_to_utf16_le(struct conv_context *c) { #define CONV_READ_UTF8 #define CONV_WRITE_UTF16_LE -#include "charset/charconv-gen.h" +#include } static int @@ -342,7 +342,7 @@ conv_utf16_le_to_utf8(struct conv_context *c) { #define CONV_READ_UTF16_LE #define CONV_WRITE_UTF8 -#include "charset/charconv-gen.h" +#include } static int @@ -350,7 +350,7 @@ conv_utf16_be_to_utf16_le(struct conv_context *c) { #define CONV_READ_UTF16_BE #define CONV_WRITE_UTF16_LE -#include "charset/charconv-gen.h" +#include } static int diff --git a/charset/cs2cs.c b/charset/cs2cs.c index 2593165c..1ec48a18 100644 --- a/charset/cs2cs.c +++ b/charset/cs2cs.c @@ -9,7 +9,7 @@ */ #include "sherlock/sherlock.h" -#include "charset/charconv.h" +#include #include #include diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c index 1289213e..252e8994 100644 --- a/charset/fb-charconv.c +++ b/charset/fb-charconv.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "charset/charconv.h" -#include "charset/fb-charconv.h" +#include +#include +#include +#include #define BUFSIZE 1024 diff --git a/charset/mp-charconv.c b/charset/mp-charconv.c index ac604495..607e91ab 100644 --- a/charset/mp-charconv.c +++ b/charset/mp-charconv.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/mp-charconv.h" +#include +#include #include #include diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h index 97604983..a51e05e7 100644 --- a/charset/mp-charconv.h +++ b/charset/mp-charconv.h @@ -10,8 +10,8 @@ #ifndef _CHARSET_MP_CHARCONV_H #define _CHARSET_MP_CHARCONV_H -#include "ucw/mempool.h" -#include "charset/charconv.h" +#include +#include byte *mp_strconv(struct mempool *mp, const byte *s, uns cs_in, uns cs_out); diff --git a/charset/setnames.c b/charset/setnames.c index ac99fbd7..d4d8f3e0 100644 --- a/charset/setnames.c +++ b/charset/setnames.c @@ -8,8 +8,8 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "charset/charconv.h" +#include +#include #include diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c index 853bd9db..3286f0fe 100644 --- a/charset/stk-charconv.c +++ b/charset/stk-charconv.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/stk-charconv.h" +#include +#include #include #define INITIAL_MIN_SIZE 16 diff --git a/charset/stk-charconv.h b/charset/stk-charconv.h index 1eb368d1..154edacf 100644 --- a/charset/stk-charconv.h +++ b/charset/stk-charconv.h @@ -10,7 +10,7 @@ #ifndef _CHARSET_STK_CHARCONV_H #define _CHARSET_STK_CHARCONV_H -#include "charset/charconv.h" +#include #include /* The following macros convert strings between given charsets (CONV_CHARSET_x). */ diff --git a/charset/tocat.c b/charset/tocat.c index 77f49d15..a5f9da46 100644 --- a/charset/tocat.c +++ b/charset/tocat.c @@ -7,6 +7,6 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/unicat.h" -#include "charset/U-cat.h" +#include +#include +#include diff --git a/charset/toligatures.c b/charset/toligatures.c index f12c572d..cdeb7cd2 100644 --- a/charset/toligatures.c +++ b/charset/toligatures.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/unicat.h" -#include "charset/U-ligatures.h" +#include +#include +#include const u16 * Uexpand_lig(uns x) diff --git a/charset/tolower.c b/charset/tolower.c index 9c975044..84544d7e 100644 --- a/charset/tolower.c +++ b/charset/tolower.c @@ -7,6 +7,6 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/unicat.h" -#include "charset/U-lower.h" +#include +#include +#include diff --git a/charset/toupper.c b/charset/toupper.c index 5691d4e0..5e2b91ec 100644 --- a/charset/toupper.c +++ b/charset/toupper.c @@ -7,6 +7,6 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/unicat.h" -#include "charset/U-upper.h" +#include +#include +#include diff --git a/charset/unaccent.c b/charset/unaccent.c index 9f7f79dc..4bb97a59 100644 --- a/charset/unaccent.c +++ b/charset/unaccent.c @@ -7,6 +7,6 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "charset/unicat.h" -#include "charset/U-unacc.h" +#include +#include +#include diff --git a/free/libs/examples/external/test.c b/free/libs/examples/external/test.c index 5c88e2f1..28e45c86 100644 --- a/free/libs/examples/external/test.c +++ b/free/libs/examples/external/test.c @@ -1,4 +1,4 @@ -#include "ucw/lib.h" +#include int main(void) { diff --git a/free/libs/examples/internal/test.c b/free/libs/examples/internal/test.c index 5c88e2f1..28e45c86 100644 --- a/free/libs/examples/internal/test.c +++ b/free/libs/examples/internal/test.c @@ -1,4 +1,4 @@ -#include "ucw/lib.h" +#include int main(void) { diff --git a/images/color-tool.c b/images/color-tool.c index 1a59d2f9..73d97e4c 100644 --- a/images/color-tool.c +++ b/images/color-tool.c @@ -7,9 +7,9 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "images/images.h" -#include "images/color.h" +#include +#include +#include #include #include diff --git a/images/color.c b/images/color.c index f22cba68..dd7a0238 100644 --- a/images/color.c +++ b/images/color.c @@ -9,11 +9,11 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "images/images.h" -#include "images/color.h" -#include "images/error.h" -#include "images/math.h" +#include +#include +#include +#include +#include #include #include @@ -163,7 +163,7 @@ struct image_conv_options image_conv_defaults = { #define IMAGE_WALK_SEC_COL_STEP 1 #define IMAGE_WALK_UNROLL 4 #define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_pos[1] = walk_pos[2] = walk_sec_pos[0]; }while(0) -#include "images/image-walk.h" +#include #define IMAGE_WALK_PREFIX(x) walk_##x #define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_gray_1 @@ -171,7 +171,7 @@ struct image_conv_options image_conv_defaults = { #define IMAGE_WALK_COL_STEP 1 #define IMAGE_WALK_UNROLL 2 #define IMAGE_WALK_DO_STEP do{ walk_pos[0] = rgb_to_gray_func(walk_sec_pos[0], walk_sec_pos[1], walk_sec_pos[2]); }while(0) -#include "images/image-walk.h" +#include /* Grayscale <-> YCbCr */ @@ -181,7 +181,7 @@ struct image_conv_options image_conv_defaults = { #define IMAGE_WALK_SEC_COL_STEP 1 #define IMAGE_WALK_UNROLL 4 #define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_pos[2] = 0; }while(0) -#include "images/image-walk.h" +#include #define IMAGE_WALK_PREFIX(x) walk_##x #define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_gray_1 @@ -189,7 +189,7 @@ struct image_conv_options image_conv_defaults = { #define IMAGE_WALK_COL_STEP 1 #define IMAGE_WALK_UNROLL 4 #define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; }while(0) -#include "images/image-walk.h" +#include /* YCbCr <-> RGB */ @@ -209,7 +209,7 @@ pixel_conv_ycbcr_to_rgb(byte *dest, byte *src) #define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_rgb_n #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include static inline void pixel_conv_rgb_to_ycbcr(byte *dest, byte *src) @@ -227,7 +227,7 @@ pixel_conv_rgb_to_ycbcr(byte *dest, byte *src) #define IMAGE_WALK_FUNC_NAME image_conv_rgb_n_to_ycbcr_n #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_ycbcr(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include /* CMYK <-> RGB */ @@ -245,7 +245,7 @@ pixel_conv_cmyk_to_rgb(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_SEC_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_cmyk_to_rgb(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include static inline void pixel_conv_rgb_to_cmyk(byte *dest, byte *src) @@ -264,7 +264,7 @@ pixel_conv_rgb_to_cmyk(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_cmyk(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include /* CMYK <-> YCbCr */ @@ -273,14 +273,14 @@ pixel_conv_rgb_to_cmyk(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_SEC_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_cmyk_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycbcr(walk_pos, walk_pos); }while(0) -#include "images/image-walk.h" +#include #define IMAGE_WALK_PREFIX(x) walk_##x #define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_cmyk_4 #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_cmyk(walk_pos, walk_pos); }while(0) -#include "images/image-walk.h" +#include /* YCCK <-> RGB */ @@ -299,7 +299,7 @@ pixel_conv_ycck_to_rgb(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_SEC_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_ycck_to_rgb(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include static inline void pixel_conv_rgb_to_ycck(byte *dest, byte *src) @@ -321,7 +321,7 @@ pixel_conv_rgb_to_ycck(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_rgb_to_ycck(walk_pos, walk_sec_pos); }while(0) -#include "images/image-walk.h" +#include /* YCCK <-> YCbCr */ @@ -330,14 +330,14 @@ pixel_conv_rgb_to_ycck(byte *dest, byte *src) #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_SEC_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_ycck_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycbcr(walk_pos, walk_pos); }while(0) -#include "images/image-walk.h" +#include #define IMAGE_WALK_PREFIX(x) walk_##x #define IMAGE_WALK_FUNC_NAME image_conv_ycbcr_n_to_ycck_4 #define IMAGE_WALK_DOUBLE #define IMAGE_WALK_COL_STEP 4 #define IMAGE_WALK_DO_STEP do{ pixel_conv_ycbcr_to_rgb(walk_pos, walk_sec_pos); pixel_conv_rgb_to_ycck(walk_pos, walk_pos); }while(0) -#include "images/image-walk.h" +#include /* Main functions */ @@ -484,7 +484,7 @@ image_conv_copy(struct image *dest, struct image *src) # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; }while(0) -# include "images/image-walk.h" +# include } return; case 2: @@ -495,7 +495,7 @@ image_conv_copy(struct image *dest, struct image *src) # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; }while(0) -# include "images/image-walk.h" +# include return; case 3: # define IMAGE_WALK_PREFIX(x) walk_##x @@ -505,7 +505,7 @@ image_conv_copy(struct image *dest, struct image *src) # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_UNROLL 2 # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; }while(0) -# include "images/image-walk.h" +# include return; case 4: # define IMAGE_WALK_PREFIX(x) walk_##x @@ -515,7 +515,7 @@ image_conv_copy(struct image *dest, struct image *src) # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_UNROLL 2 # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; walk_pos[3] = walk_sec_pos[3]; }while(0) -# include "images/image-walk.h" +# include return; default: # define IMAGE_WALK_PREFIX(x) walk_##x @@ -524,7 +524,7 @@ image_conv_copy(struct image *dest, struct image *src) # define IMAGE_WALK_IMAGE dest # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_DO_STEP do{ for (uns i = 0; i < channels; i++) walk_pos[i] = walk_sec_pos[i]; }while(0) -# include "images/image-walk.h" +# include return; } } @@ -557,7 +557,7 @@ image_conv_fill_alpha(struct image *dest) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[1] = 255; }while(0) -# include "images/image-walk.h" +# include return; } break; @@ -570,7 +570,7 @@ image_conv_fill_alpha(struct image *dest) # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[3] = 255; }while(0) -# include "images/image-walk.h" +# include return; } break; @@ -581,7 +581,7 @@ image_conv_fill_alpha(struct image *dest) # define IMAGE_WALK_IMAGE dest # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[dest->channels - 1] = 255; }while(0) -# include "images/image-walk.h" +# include } } @@ -597,7 +597,7 @@ image_conv_copy_alpha(struct image *dest, struct image *src) # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_UNROLL 4 # define IMAGE_WALK_DO_STEP do{ walk_pos[dest->channels - 1] = walk_sec_pos[src->channels - 1]; }while(0) -# include "images/image-walk.h" +# include } } @@ -630,7 +630,7 @@ image_conv_apply_alpha_from(struct image_context *ctx, struct image *dest, struc # define IMAGE_WALK_UNROLL 2 # define IMAGE_WALK_DO_STEP do{ \ walk_pos[0] = image_conv_alpha_func(walk_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); }while(0) -# include "images/image-walk.h" +# include } return 1; case 3: @@ -644,7 +644,7 @@ image_conv_apply_alpha_from(struct image_context *ctx, struct image *dest, struc walk_pos[0] = image_conv_alpha_func(walk_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); \ walk_pos[1] = image_conv_alpha_func(walk_pos[1], walk_sec_pos[src->channels - 1], a[1], b[1]); \ walk_pos[2] = image_conv_alpha_func(walk_pos[2], walk_sec_pos[src->channels - 1], a[2], b[2]); }while(0) -# include "images/image-walk.h" +# include } return 1; } @@ -656,7 +656,7 @@ image_conv_apply_alpha_from(struct image_context *ctx, struct image *dest, struc # define IMAGE_WALK_DOUBLE # define IMAGE_WALK_DO_STEP do{ for (uns i = 0; i < dest->channels; i++) \ walk_pos[i] = image_conv_alpha_func(walk_pos[i], walk_sec_pos[src->channels - 1], a[i], b[i]); }while(0) -# include "images/image-walk.h" +# include } return 1; } @@ -687,7 +687,7 @@ image_conv_apply_alpha_to(struct image_context *ctx, struct image *dest, struct # define IMAGE_WALK_UNROLL 2 # define IMAGE_WALK_DO_STEP do{ \ walk_pos[0] = image_conv_alpha_func(walk_sec_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); }while(0) -# include "images/image-walk.h" +# include } return 1; case 3: @@ -701,7 +701,7 @@ image_conv_apply_alpha_to(struct image_context *ctx, struct image *dest, struct walk_pos[0] = image_conv_alpha_func(walk_sec_pos[0], walk_sec_pos[src->channels - 1], a[0], b[0]); \ walk_pos[1] = image_conv_alpha_func(walk_sec_pos[1], walk_sec_pos[src->channels - 1], a[1], b[1]); \ walk_pos[2] = image_conv_alpha_func(walk_sec_pos[2], walk_sec_pos[src->channels - 1], a[2], b[2]); }while(0) -# include "images/image-walk.h" +# include } return 1; } @@ -713,7 +713,7 @@ image_conv_apply_alpha_to(struct image_context *ctx, struct image *dest, struct # define IMAGE_WALK_DOUBLE # define IMAGE_WALK_DO_STEP do{ for (uns i = 0; i < dest->channels; i++) \ walk_pos[i] = image_conv_alpha_func(walk_sec_pos[i], walk_sec_pos[src->channels - 1], a[i], b[i]); }while(0) -# include "images/image-walk.h" +# include } return 1; } diff --git a/images/color.h b/images/color.h index a148e6c3..ad0a5ebd 100644 --- a/images/color.h +++ b/images/color.h @@ -25,7 +25,7 @@ #ifndef _IMAGES_COLOR_H #define _IMAGES_COLOR_H -#include "images/images.h" +#include /* Basic color spaces */ enum { diff --git a/images/config.c b/images/config.c index c3a5855e..cce37c01 100644 --- a/images/config.c +++ b/images/config.c @@ -6,11 +6,11 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "images/images.h" +#include +#include +#include #if defined(CONFIG_IMAGES_SIM) || defined(CONFIG_IMAGES_DUP) -#include "images/signature.h" +#include #endif #include diff --git a/images/context.c b/images/context.c index 13ce4b8c..1248e885 100644 --- a/images/context.c +++ b/images/context.c @@ -9,10 +9,10 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/bbuf.h" -#include "images/images.h" -#include "images/error.h" +#include +#include +#include +#include #include diff --git a/images/dup-cmp.c b/images/dup-cmp.c index e16f0634..c0232a4d 100644 --- a/images/dup-cmp.c +++ b/images/dup-cmp.c @@ -9,11 +9,11 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/duplicates.h" +#include +#include +#include +#include +#include #include diff --git a/images/dup-init.c b/images/dup-init.c index 4900af51..a59e3300 100644 --- a/images/dup-init.c +++ b/images/dup-init.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/color.h" -#include "images/duplicates.h" +#include +#include +#include +#include +#include +#include #include diff --git a/images/image-dup-test.c b/images/image-dup-test.c index 7e1916cb..feece3d1 100644 --- a/images/image-dup-test.c +++ b/images/image-dup-test.c @@ -7,13 +7,13 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" -#include "ucw/mempool.h" -#include "images/images.h" -#include "images/color.h" -#include "images/duplicates.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/images/image-sim-test.c b/images/image-sim-test.c index ed43e0f2..52cf6771 100644 --- a/images/image-sim-test.c +++ b/images/image-sim-test.c @@ -7,14 +7,14 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" -#include "ucw/base64.h" -#include "ucw/base224.h" -#include "images/images.h" -#include "images/color.h" -#include "images/signature.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/images/image-test.c b/images/image-test.c index 0aad5057..aeae9dd2 100644 --- a/images/image-test.c +++ b/images/image-test.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "ucw/threads.h" -#include "images/images.h" -#include "images/color.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/images/image-tool.c b/images/image-tool.c index 1984906e..3f24d029 100644 --- a/images/image-tool.c +++ b/images/image-tool.c @@ -7,10 +7,10 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/color.h" +#include +#include +#include +#include #include #include diff --git a/images/image.c b/images/image.c index c741d396..d0d16d8f 100644 --- a/images/image.c +++ b/images/image.c @@ -9,11 +9,11 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" +#include +#include +#include +#include +#include #include @@ -117,7 +117,7 @@ image_clone(struct image_context *ctx, struct image *src, uns flags, struct memp # define IMAGE_WALK_SEC_IMAGE src # define IMAGE_WALK_DOUBLE # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = walk_sec_pos[0]; walk_pos[1] = walk_sec_pos[1]; walk_pos[2] = walk_sec_pos[2]; }while(0) -# include "images/image-walk.h" +# include } else if (src->row_size != img->row_size || ((img->flags | src->flags) & IMAGE_GAPS_PROTECTED)) { diff --git a/images/images.h b/images/images.h index d555ce52..60bd1664 100644 --- a/images/images.h +++ b/images/images.h @@ -10,7 +10,7 @@ #ifndef _IMAGES_IMAGES_H #define _IMAGES_IMAGES_H -#include "ucw/bbuf.h" +#include struct mempool; struct fastbuf; diff --git a/images/io-libjpeg.c b/images/io-libjpeg.c index 8725610d..74af24ac 100644 --- a/images/io-libjpeg.c +++ b/images/io-libjpeg.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -446,7 +446,7 @@ libjpeg_read_data(struct image_io *io) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ walk_pos[0] = *src++; walk_pos[1] = 255; }while(0) -# include "images/image-walk.h" +# include } break; case 4: /* * -> *+Alpha or aligned * */ @@ -460,7 +460,7 @@ libjpeg_read_data(struct image_io *io) # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_DO_ROW_START do{ src = buf; jpeg_read_scanlines(&i->cinfo, (JSAMPLE **)&src, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = *(u32 *)src; walk_pos[3] = 255; src += 3; }while(0) -# include "images/image-walk.h" +# include } break; default: @@ -577,7 +577,7 @@ libjpeg_write(struct image_io *io) # define IMAGE_WALK_COL_STEP 2 # define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; }while(0) -# include "images/image-walk.h" +# include break; } case 4: /* *+Alpha or aligned * -> * */ @@ -591,7 +591,7 @@ libjpeg_write(struct image_io *io) # define IMAGE_WALK_COL_STEP 4 # define IMAGE_WALK_DO_ROW_END do{ dest = buf; jpeg_write_scanlines(&i.cinfo, (JSAMPLE **)&dest, 1); }while(0) # define IMAGE_WALK_DO_STEP do{ *dest++ = walk_pos[0]; *dest++ = walk_pos[1]; *dest++ = walk_pos[2]; }while(0) -# include "images/image-walk.h" +# include break; } default: diff --git a/images/io-libmagick.c b/images/io-libmagick.c index fd9069f3..0a31c0af 100644 --- a/images/io-libmagick.c +++ b/images/io-libmagick.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -203,7 +203,7 @@ libmagick_read_data(struct image_io *io) # define IMAGE_WALK_DO_STEP do{ \ walk_pos[0] = libmagick_pixel_to_gray(src); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 2: @@ -216,7 +216,7 @@ libmagick_read_data(struct image_io *io) walk_pos[0] = libmagick_pixel_to_gray(src); \ walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 3: @@ -230,7 +230,7 @@ libmagick_read_data(struct image_io *io) walk_pos[1] = QUANTUM_TO_BYTE(src->green); \ walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \ src++; }while(0) -# include "images/image-walk.h" +# include break; case 4: @@ -245,7 +245,7 @@ libmagick_read_data(struct image_io *io) walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \ walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \ src++; }while(0) -# include "images/image-walk.h" +# include break; default: @@ -333,7 +333,7 @@ libmagick_write(struct image_io *io) dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \ dest->opacity = 0; \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 2: @@ -348,7 +348,7 @@ libmagick_write(struct image_io *io) dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \ dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 3: @@ -363,7 +363,7 @@ libmagick_write(struct image_io *io) dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \ dest->opacity = 0; \ dest++; }while(0) -# include "images/image-walk.h" +# include break; case 4: @@ -378,7 +378,7 @@ libmagick_write(struct image_io *io) dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \ dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \ dest++; }while(0) -# include "images/image-walk.h" +# include break; default: diff --git a/images/io-libpng.c b/images/io-libpng.c index 081ca35f..e62e5eba 100644 --- a/images/io-libpng.c +++ b/images/io-libpng.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/images/io-libungif.c b/images/io-libungif.c index ac0f51f2..7e603894 100644 --- a/images/io-libungif.c +++ b/images/io-libungif.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "images/images.h" -#include "images/error.h" -#include "images/color.h" -#include "images/io-main.h" +#include +#include +#include +#include +#include +#include +#include #include @@ -202,7 +202,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *walk_pos = pal[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 2: @@ -225,7 +225,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *(u16 *)walk_pos = ((u16 *)pal)[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 3: @@ -253,7 +253,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ byte *p = pal + 4 * (*pixels++); walk_pos[0] = p[0]; walk_pos[1] = p[1]; walk_pos[2] = p[2]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } case 4: @@ -278,7 +278,7 @@ libungif_read_data(struct image_io *io) # define IMAGE_WALK_ROW_STEP 0 # define IMAGE_WALK_DO_STEP do{ *(u32 *)walk_pos = ((u32 *)pal)[*pixels++]; }while(0) # define IMAGE_WALK_DO_ROW_END DO_ROW_END -# include "images/image-walk.h" +# include break; } default: diff --git a/images/io-main.c b/images/io-main.c index c2975842..64c1db45 100644 --- a/images/io-main.c +++ b/images/io-main.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "images/images.h" -#include "images/error.h" -#include "images/io-main.h" -#include "images/color.h" +#include +#include +#include +#include +#include +#include #include diff --git a/images/math.c b/images/math.c index 393fed0f..0e88ca9a 100644 --- a/images/math.c +++ b/images/math.c @@ -7,8 +7,8 @@ * of the GNU General Public License. */ -#include "ucw/lib.h" -#include "images/math.h" +#include +#include const u32 fast_div_tab[] = { 0, 4294967295U,2147483648U,1431655766, 1073741824, 858993460, 715827883, 613566757, diff --git a/images/object.c b/images/object.c index 9133b7e6..501b23d0 100644 --- a/images/object.c +++ b/images/object.c @@ -9,14 +9,14 @@ #undef LOCAL_DEBUG #include "sherlock/sherlock.h" -#include "ucw/base224.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" +#include +#include +#include #include "sherlock/object.h" -#include "images/images.h" -#include "images/object.h" -#include "images/color.h" -#include "images/signature.h" +#include +#include +#include +#include #include #include diff --git a/images/object.h b/images/object.h index 189b3c0b..9da98eec 100644 --- a/images/object.h +++ b/images/object.h @@ -1,7 +1,7 @@ #ifndef _IMAGES_OBJECT_H #define _IMAGES_OBJECT_H -#include "images/images.h" +#include struct image_obj_info { uns cols; diff --git a/images/scale-gen.h b/images/scale-gen.h index bbe5496e..242a2fed 100644 --- a/images/scale-gen.h +++ b/images/scale-gen.h @@ -37,7 +37,7 @@ IMAGE_SCALE_PREFIX(nearest_xy)(struct image *dest, struct image *src) # define IMAGE_WALK_COL_STEP IMAGE_SCALE_PIXEL_SIZE # define IMAGE_WALK_DO_ROW_START do{ row_start = src->pixels + (y_pos >> 16) * src->row_size; y_pos += y_inc; x_pos = x_start; }while(0) # define IMAGE_WALK_DO_STEP do{ byte *pos = row_start + (x_pos >> 16) * IMAGE_SCALE_PIXEL_SIZE; x_pos += x_inc; IMAGE_COPY_PIXEL(walk_pos, pos); }while(0) -# include "images/image-walk.h" +# include } #if 0 /* Experiments with rearranging pixels for SSE... */ diff --git a/images/scale.c b/images/scale.c index 41fda01d..26b49f4d 100644 --- a/images/scale.c +++ b/images/scale.c @@ -9,10 +9,10 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "images/images.h" -#include "images/error.h" -#include "images/math.h" +#include +#include +#include +#include #include @@ -26,19 +26,19 @@ #define IMAGE_SCALE_PREFIX(x) image_scale_1_##x #define IMAGE_SCALE_PIXEL_SIZE 1 -#include "images/scale-gen.h" +#include #define IMAGE_SCALE_PREFIX(x) image_scale_2_##x #define IMAGE_SCALE_PIXEL_SIZE 2 -#include "images/scale-gen.h" +#include #define IMAGE_SCALE_PREFIX(x) image_scale_3_##x #define IMAGE_SCALE_PIXEL_SIZE 3 -#include "images/scale-gen.h" +#include #define IMAGE_SCALE_PREFIX(x) image_scale_4_##x #define IMAGE_SCALE_PIXEL_SIZE 4 -#include "images/scale-gen.h" +#include /* Simple "nearest neighbour" algorithm */ diff --git a/images/sig-cmp.c b/images/sig-cmp.c index 71beecf2..cb22f9de 100644 --- a/images/sig-cmp.c +++ b/images/sig-cmp.c @@ -9,17 +9,17 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "images/math.h" -#include "images/images.h" -#include "images/signature.h" +#include +#include +#include +#include #include #define ASORT_PREFIX(x) image_signatures_dist_integrated_##x #define ASORT_KEY_TYPE uns -#include "ucw/sorter/array-simple.h" +#include #define EXPLAIN -#include "images/sig-cmp-gen.h" -#include "images/sig-cmp-gen.h" +#include +#include diff --git a/images/sig-dump.c b/images/sig-dump.c index 4a7bdf2a..f71b1516 100644 --- a/images/sig-dump.c +++ b/images/sig-dump.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "images/images.h" -#include "images/signature.h" +#include +#include +#include #include byte * diff --git a/images/sig-init.c b/images/sig-init.c index 34089216..3c76920f 100644 --- a/images/sig-init.c +++ b/images/sig-init.c @@ -9,14 +9,14 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/conf.h" -#include "images/images.h" -#include "images/math.h" -#include "images/error.h" -#include "images/color.h" -#include "images/signature.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/images/sig-seg.c b/images/sig-seg.c index 082a1c8e..fae309ff 100644 --- a/images/sig-seg.c +++ b/images/sig-seg.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/heap.h" -#include "images/images.h" -#include "images/signature.h" -#include "images/math.h" +#include +#include +#include +#include +#include +#include #include @@ -93,7 +93,7 @@ prequant_heap_cmp(struct image_sig_region *a, struct image_sig_region *b) #define ASORT_PREFIX(x) prequant_##x #define ASORT_KEY_TYPE uns -#include "ucw/sorter/array-simple.h" +#include static uns prequant(struct image_sig_block *blocks, uns blocks_count, struct image_sig_region *regions) diff --git a/images/sig-txt.c b/images/sig-txt.c index 2e20f071..d4ea597c 100644 --- a/images/sig-txt.c +++ b/images/sig-txt.c @@ -9,10 +9,10 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "images/images.h" -#include "images/signature.h" -#include "images/math.h" +#include +#include +#include +#include #include diff --git a/shxml/common.c b/shxml/common.c index de439cbf..cfccbf97 100644 --- a/shxml/common.c +++ b/shxml/common.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "shxml/xml.h" -#include "shxml/dtd.h" -#include "shxml/internals.h" -#include "ucw/stkstring.h" -#include "ucw/ff-unicode.h" +#include +#include +#include +#include +#include +#include #include diff --git a/shxml/dtd.c b/shxml/dtd.c index 7693bedb..9c3402d2 100644 --- a/shxml/dtd.c +++ b/shxml/dtd.c @@ -9,13 +9,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "shxml/xml.h" -#include "shxml/dtd.h" -#include "shxml/internals.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-unicode.h" -#include "ucw/unicode.h" +#include +#include +#include +#include +#include +#include +#include /* Notations */ @@ -29,7 +29,7 @@ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include struct xml_dtd_notn * xml_dtd_find_notn(struct xml_context *ctx, char *name) @@ -51,7 +51,7 @@ xml_dtd_find_notn(struct xml_context *ctx, char *name) #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include static struct xml_dtd_entity * xml_dtd_declare_trivial_entity(struct xml_context *ctx, char *name, char *text) @@ -155,7 +155,7 @@ xml_dtd_elems_init_data(struct xml_dtd_elems_table *tab UNUSED, struct xml_dtd_e #define HASH_GIVE_INIT_DATA #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include struct xml_dtd_elem * xml_dtd_find_elem(struct xml_context *ctx, char *name) @@ -200,7 +200,7 @@ xml_dtd_enodes_init_key(struct xml_dtd_enodes_table *tab UNUSED, struct xml_dtd_ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include /* Element attributes */ @@ -240,7 +240,7 @@ xml_dtd_attrs_init_key(struct xml_dtd_attrs_table *tab UNUSED, struct xml_dtd_at #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include struct xml_dtd_attr * xml_dtd_find_attr(struct xml_context *ctx, struct xml_dtd_elem *elem, char *name) @@ -284,7 +284,7 @@ xml_dtd_evals_init_key(struct xml_dtd_evals_table *tab UNUSED, struct xml_dtd_ev #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include /* Enumerated attribute notations */ @@ -322,7 +322,7 @@ xml_dtd_enotns_init_key(struct xml_dtd_enotns_table *tab UNUSED, struct xml_dtd_ #define HASH_GIVE_ALLOC #define HASH_TABLE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include /* DTD initialization/cleanup */ diff --git a/shxml/dtd.h b/shxml/dtd.h index f6533634..493a5f66 100644 --- a/shxml/dtd.h +++ b/shxml/dtd.h @@ -10,7 +10,7 @@ #ifndef _SHERLOCK_XML_DTD_H #define _SHERLOCK_XML_DTD_H -#include "shxml/xml.h" +#include struct xml_dtd { struct mempool *pool; /* Memory pool where to allocate DTD */ diff --git a/shxml/internals.h b/shxml/internals.h index 490c1f45..ad2c3a8a 100644 --- a/shxml/internals.h +++ b/shxml/internals.h @@ -10,8 +10,8 @@ #ifndef _SHERLOCK_XML_INTERNALS_H #define _SHERLOCK_XML_INTERNALS_H -#include "shxml/xml.h" -#include "shxml/dtd.h" +#include +#include /*** Debugging ***/ diff --git a/shxml/parse.c b/shxml/parse.c index 9fb3a2ee..0865dca9 100644 --- a/shxml/parse.c +++ b/shxml/parse.c @@ -9,15 +9,15 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "shxml/xml.h" -#include "shxml/dtd.h" -#include "shxml/internals.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-unicode.h" -#include "ucw/unicode.h" -#include "ucw/chartype.h" -#include "ucw/hashfunc.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -622,7 +622,7 @@ xml_attrs_init_key(struct xml_attrs_table *t UNUSED, struct xml_attr *a, struct #define HASH_WANT_FIND #define HASH_GIVE_ALLOC XML_HASH_GIVE_ALLOC -#include "ucw/hashtable.h" +#include static void xml_parse_attr(struct xml_context *ctx) diff --git a/shxml/source.c b/shxml/source.c index 14debf01..d672b797 100644 --- a/shxml/source.c +++ b/shxml/source.c @@ -9,14 +9,14 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "shxml/xml.h" -#include "shxml/dtd.h" -#include "shxml/internals.h" -#include "ucw/unicode.h" -#include "ucw/ff-unicode.h" -#include "charset/charconv.h" -#include "charset/fb-charconv.h" +#include +#include +#include +#include +#include +#include +#include +#include /*** Charecter categorization ***/ diff --git a/shxml/xml-test.c b/shxml/xml-test.c index 6bd4a493..f86547a0 100644 --- a/shxml/xml-test.c +++ b/shxml/xml-test.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "shxml/xml.h" -#include "shxml/dtd.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include +#include #include #include diff --git a/shxml/xml.h b/shxml/xml.h index e9458883..074c6049 100644 --- a/shxml/xml.h +++ b/shxml/xml.h @@ -10,10 +10,10 @@ #ifndef _SHERLOCK_XML_XML_H #define _SHERLOCK_XML_XML_H -#include "ucw/clists.h" -#include "ucw/slists.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include struct xml_context; struct xml_dtd_entity; diff --git a/ucw/adler32.c b/ucw/adler32.c index 28b2b05a..174b611d 100644 --- a/ucw/adler32.c +++ b/ucw/adler32.c @@ -7,8 +7,8 @@ * distribution and use, see copyright notice in zlib.h. */ -#include "ucw/lib.h" -#include "ucw/lizard.h" +#include +#include #define BASE 65521UL /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ diff --git a/ucw/alloc.c b/ucw/alloc.c index 4528e097..c4e40640 100644 --- a/ucw/alloc.c +++ b/ucw/alloc.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include #include diff --git a/ucw/alloc_str.c b/ucw/alloc_str.c index a9543c5b..bcc49b08 100644 --- a/ucw/alloc_str.c +++ b/ucw/alloc_str.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include diff --git a/ucw/asio.c b/ucw/asio.c index 038bc181..014435e8 100644 --- a/ucw/asio.c +++ b/ucw/asio.c @@ -9,9 +9,9 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/asio.h" -#include "ucw/threads.h" +#include +#include +#include #include #include diff --git a/ucw/asio.h b/ucw/asio.h index f80cc699..420e0d69 100644 --- a/ucw/asio.h +++ b/ucw/asio.h @@ -10,8 +10,8 @@ #ifndef _UCW_ASIO_H #define _UCW_ASIO_H -#include "ucw/workqueue.h" -#include "ucw/clists.h" +#include +#include /* * This module takes care of scheduling and executing asynchronous I/O requests diff --git a/ucw/asort-test.c b/ucw/asort-test.c index f89e0b86..a0f0d019 100644 --- a/ucw/asort-test.c +++ b/ucw/asort-test.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include #include @@ -62,7 +62,7 @@ static int qs_comp(const struct elt *X, const struct elt *Y) } #define ASORT_PREFIX(x) as_##x -#include "ucw/sorter/array-simple.h" +#include int main(void) { diff --git a/ucw/base224.c b/ucw/base224.c index 8e5cec3d..38f1d788 100644 --- a/ucw/base224.c +++ b/ucw/base224.c @@ -25,8 +25,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/base224.h" +#include +#include static void encode_block(byte *w, u32 hi, u32 lo) diff --git a/ucw/base64.c b/ucw/base64.c index 56f30766..f50e48eb 100644 --- a/ucw/base64.c +++ b/ucw/base64.c @@ -9,9 +9,9 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/base64.h" -#include "ucw/threads.h" +#include +#include +#include #include diff --git a/ucw/bbuf.c b/ucw/bbuf.c index 61c2a272..67a95da6 100644 --- a/ucw/bbuf.c +++ b/ucw/bbuf.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/bbuf.h" +#include +#include #include diff --git a/ucw/bbuf.h b/ucw/bbuf.h index ecc1f66c..bb023a02 100644 --- a/ucw/bbuf.h +++ b/ucw/bbuf.h @@ -12,7 +12,7 @@ #define GBUF_TYPE byte #define GBUF_PREFIX(x) bb_##x -#include "ucw/gbuf.h" +#include /** * printf() into a growing buffer with `va_list` arguments. diff --git a/ucw/bigalloc.c b/ucw/bigalloc.c index 852d8e42..0044846d 100644 --- a/ucw/bigalloc.c +++ b/ucw/bigalloc.c @@ -8,7 +8,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include #include diff --git a/ucw/binheap-test.c b/ucw/binheap-test.c index 9589b07b..76b1a9bc 100644 --- a/ucw/binheap-test.c +++ b/ucw/binheap-test.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include #include @@ -16,7 +16,7 @@ #define BH_WANT_INSERT #define BH_WANT_FINDMIN #define BH_WANT_DELETEMIN -#include "ucw/binheap-node.h" +#include struct item { struct bh_node n; @@ -52,7 +52,7 @@ bht_dump(struct bh_heap *h) bht_do_dump(b, b->last_son, 1); } -#include "ucw/binheap.h" +#include int main(void) { diff --git a/ucw/bit-ffs.c b/ucw/bit-ffs.c index 0775f536..0b23f34c 100644 --- a/ucw/bit-ffs.c +++ b/ucw/bit-ffs.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/bitops.h" +#include +#include /* Just a table, the rest is in bitops.h */ diff --git a/ucw/bit-fls.c b/ucw/bit-fls.c index ef38df30..9a2fe435 100644 --- a/ucw/bit-fls.c +++ b/ucw/bit-fls.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/bitops.h" +#include +#include int bit_fls(u32 x) diff --git a/ucw/bitsig.c b/ucw/bitsig.c index 85b18a6b..64587849 100644 --- a/ucw/bitsig.c +++ b/ucw/bitsig.c @@ -41,9 +41,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/bitsig.h" -#include "ucw/md5.h" +#include +#include +#include #include diff --git a/ucw/char-cat.c b/ucw/char-cat.c index e1bd2811..e9b14804 100644 --- a/ucw/char-cat.c +++ b/ucw/char-cat.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" +#include +#include const byte _c_cat[256] = { #define CHAR(code,upper,lower,cat) cat, -#include "ucw/char-map.h" +#include #undef CHAR }; diff --git a/ucw/char-lower.c b/ucw/char-lower.c index 91ff8aa2..cc6f99eb 100644 --- a/ucw/char-lower.c +++ b/ucw/char-lower.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" +#include +#include const byte _c_lower[256] = { #define CHAR(code,upper,lower,cat) lower, -#include "ucw/char-map.h" +#include #undef CHAR }; diff --git a/ucw/char-upper.c b/ucw/char-upper.c index 53846d79..69a0320b 100644 --- a/ucw/char-upper.c +++ b/ucw/char-upper.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" +#include +#include const byte _c_upper[256] = { #define CHAR(code,upper,lower,cat) upper, -#include "ucw/char-map.h" +#include #undef CHAR }; diff --git a/ucw/conf-alloc.c b/ucw/conf-alloc.c index 1a0de4f2..937965dd 100644 --- a/ucw/conf-alloc.c +++ b/ucw/conf-alloc.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/mempool.h" +#include +#include +#include struct mempool *cf_pool; // current pool for loading new configuration diff --git a/ucw/conf-dump.c b/ucw/conf-dump.c index a2a92df2..2176f71e 100644 --- a/ucw/conf-dump.c +++ b/ucw/conf-dump.c @@ -8,12 +8,12 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/conf-internal.h" -#include "ucw/clists.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include +#include +#include static void spaces(struct fastbuf *fb, uns nr) diff --git a/ucw/conf-input.c b/ucw/conf-input.c index 568aba2e..117c5482 100644 --- a/ucw/conf-input.c +++ b/ucw/conf-input.c @@ -8,16 +8,16 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/conf-internal.h" -#include "ucw/clists.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" -#include "ucw/chartype.h" -#include "ucw/string.h" -#include "ucw/stkstring.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -33,13 +33,13 @@ static uns line_num; static char line_buf[MAX_LINE]; static char *line = line_buf; -#include "ucw/bbuf.h" +#include static bb_t copy_buf; static uns copied; #define GBUF_TYPE uns #define GBUF_PREFIX(x) split_##x -#include "ucw/gbuf.h" +#include static split_t word_buf; static uns words; static uns ends_by_brace; // the line is ended by "{" diff --git a/ucw/conf-intr.c b/ucw/conf-intr.c index deae4505..ba32dd7b 100644 --- a/ucw/conf-intr.c +++ b/ucw/conf-intr.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/conf-internal.h" -#include "ucw/clists.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/conf-journal.c b/ucw/conf-journal.c index b0b90134..6134bfd2 100644 --- a/ucw/conf-journal.c +++ b/ucw/conf-journal.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/conf-internal.h" -#include "ucw/mempool.h" +#include +#include +#include +#include +#include #include diff --git a/ucw/conf-parse.c b/ucw/conf-parse.c index 4cfeee14..f2f15a99 100644 --- a/ucw/conf-parse.c +++ b/ucw/conf-parse.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/chartype.h" +#include +#include +#include #include #include diff --git a/ucw/conf-section.c b/ucw/conf-section.c index 4112d888..9cac24a5 100644 --- a/ucw/conf-section.c +++ b/ucw/conf-section.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/conf-internal.h" -#include "ucw/clists.h" -#include "ucw/binsearch.h" +#include +#include +#include +#include +#include #include @@ -24,7 +24,7 @@ struct dirty_section { }; #define GBUF_TYPE struct dirty_section #define GBUF_PREFIX(x) dirtsec_##x -#include "ucw/gbuf.h" +#include static dirtsec_t dirty; static uns dirties; @@ -44,7 +44,7 @@ cf_add_dirty(struct cf_section *sec, void *ptr) #define ASORT_KEY_TYPE struct dirty_section #define ASORT_ELT(i) dirty.ptr[i] #define ASORT_LT(x,y) x.sec < y.sec || x.sec == y.sec && x.ptr < y.ptr -#include "ucw/sorter/array-simple.h" +#include static void sort_dirty(void) diff --git a/ucw/conf-test.c b/ucw/conf-test.c index e226fae9..34d1f36b 100644 --- a/ucw/conf-test.c +++ b/ucw/conf-test.c @@ -4,11 +4,11 @@ * (c) 2006 Robert Spalek */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/clists.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/eltpool.c b/ucw/eltpool.c index 99f353bc..11fd14aa 100644 --- a/ucw/eltpool.c +++ b/ucw/eltpool.c @@ -18,8 +18,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/eltpool.h" +#include +#include struct eltpool * ep_new(uns elt_size, uns elts_per_chunk) @@ -73,7 +73,7 @@ ep_total_size(struct eltpool *pool) #ifdef TEST #include -#include "ucw/clists.h" +#include struct argh { cnode n; diff --git a/ucw/exitstatus.c b/ucw/exitstatus.c index 1d7b70a4..fec5593f 100644 --- a/ucw/exitstatus.c +++ b/ucw/exitstatus.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/process.h" +#include +#include #include #include diff --git a/ucw/fastbuf.c b/ucw/fastbuf.c index a66d712b..ac6eaea7 100644 --- a/ucw/fastbuf.c +++ b/ucw/fastbuf.c @@ -9,11 +9,11 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/resource.h" -#include "ucw/trans.h" -#include "ucw/stkstring.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/fb-atomic.c b/ucw/fb-atomic.c index 8cee3087..3057f501 100644 --- a/ucw/fb-atomic.c +++ b/ucw/fb-atomic.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/io.h" -#include "ucw/conf.h" -#include "ucw/trans.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/fb-buffer.c b/ucw/fb-buffer.c index 846ff8f9..8e87d39d 100644 --- a/ucw/fb-buffer.c +++ b/ucw/fb-buffer.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include #include diff --git a/ucw/fb-direct.c b/ucw/fb-direct.c index 74a85c67..f87baa36 100644 --- a/ucw/fb-direct.c +++ b/ucw/fb-direct.c @@ -25,12 +25,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/io.h" -#include "ucw/asio.h" -#include "ucw/conf.h" -#include "ucw/threads.h" +#include +#include +#include +#include +#include +#include #include #include @@ -313,7 +313,7 @@ fbdir_open_fd_internal(int fd, const char *name, struct asio_queue *q, uns buffe #ifdef TEST -#include "ucw/getopt.h" +#include int main(int argc, char **argv) { diff --git a/ucw/fb-file.c b/ucw/fb-file.c index bfa38a9e..5394730b 100644 --- a/ucw/fb-file.c +++ b/ucw/fb-file.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/io.h" +#include +#include +#include #include #include diff --git a/ucw/fb-grow.c b/ucw/fb-grow.c index 927fe96a..0898a1a4 100644 --- a/ucw/fb-grow.c +++ b/ucw/fb-grow.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/mempool.h" +#include +#include +#include #include #include diff --git a/ucw/fb-limfd.c b/ucw/fb-limfd.c index 0ce80c6a..e1756102 100644 --- a/ucw/fb-limfd.c +++ b/ucw/fb-limfd.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include diff --git a/ucw/fb-mem.c b/ucw/fb-mem.c index 2752c240..71b171c7 100644 --- a/ucw/fb-mem.c +++ b/ucw/fb-mem.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include diff --git a/ucw/fb-mmap.c b/ucw/fb-mmap.c index b402b07c..d355a662 100644 --- a/ucw/fb-mmap.c +++ b/ucw/fb-mmap.c @@ -9,10 +9,10 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/io.h" -#include "ucw/conf.h" +#include +#include +#include +#include #include #include diff --git a/ucw/fb-param.c b/ucw/fb-param.c index f9d2b0fa..e0f9a73f 100644 --- a/ucw/fb-param.c +++ b/ucw/fb-param.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/io.h" -#include "ucw/fastbuf.h" -#include "ucw/trans.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/fb-pool.c b/ucw/fb-pool.c index e3095c73..e8628dcd 100644 --- a/ucw/fb-pool.c +++ b/ucw/fb-pool.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/fastbuf.h" +#include +#include +#include #include #include diff --git a/ucw/fb-socket.c b/ucw/fb-socket.c index 3f44cbcb..f6d73d2f 100644 --- a/ucw/fb-socket.c +++ b/ucw/fb-socket.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/fb-socket.h" +#include +#include +#include #include #include diff --git a/ucw/fb-socket.h b/ucw/fb-socket.h index 004ed772..033797a1 100644 --- a/ucw/fb-socket.h +++ b/ucw/fb-socket.h @@ -10,7 +10,7 @@ #ifndef _UCW_FB_SOCKET_H #define _UCW_FB_SOCKET_H -#include "ucw/fastbuf.h" +#include struct fbsock_params { /** Configuration of socket fastbuf. **/ int fd; diff --git a/ucw/fb-temp.c b/ucw/fb-temp.c index d9a31274..896870ea 100644 --- a/ucw/fb-temp.c +++ b/ucw/fb-temp.c @@ -8,8 +8,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include #include @@ -41,7 +41,7 @@ void bfix_tmp_file(struct fastbuf *fb, const char *name) #ifdef TEST -#include "ucw/getopt.h" +#include int main(int argc, char **argv) { diff --git a/ucw/ff-binary.c b/ucw/ff-binary.c index 47163f29..c8c0ff3a 100644 --- a/ucw/ff-binary.c +++ b/ucw/ff-binary.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-binary.h" +#include +#include +#include #define GEN(type, name, size, endian) \ type bget##name##_##endian##_slow(struct fastbuf *f) \ diff --git a/ucw/ff-binary.h b/ucw/ff-binary.h index babbbfcc..448ce062 100644 --- a/ucw/ff-binary.h +++ b/ucw/ff-binary.h @@ -11,8 +11,8 @@ #ifndef _UCW_FF_BINARY_H #define _UCW_FF_BINARY_H -#include "ucw/fastbuf.h" -#include "ucw/unaligned.h" +#include +#include #ifdef CPU_BIG_ENDIAN #define FF_ENDIAN be diff --git a/ucw/ff-printf.c b/ucw/ff-printf.c index ad80e413..8e59f2ff 100644 --- a/ucw/ff-printf.c +++ b/ucw/ff-printf.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include #include diff --git a/ucw/ff-stkstring.c b/ucw/ff-stkstring.c index 50b2c3e8..8a0c2d3a 100644 --- a/ucw/ff-stkstring.c +++ b/ucw/ff-stkstring.c @@ -12,8 +12,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include void bgets_stk_init(struct bgets_stk_struct *s) diff --git a/ucw/ff-string.c b/ucw/ff-string.c index e3cb33da..ed7815bc 100644 --- a/ucw/ff-string.c +++ b/ucw/ff-string.c @@ -8,10 +8,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/mempool.h" -#include "ucw/bbuf.h" +#include +#include +#include +#include char * /* Non-standard */ bgets(struct fastbuf *f, char *b, uns l) diff --git a/ucw/ff-unicode.c b/ucw/ff-unicode.c index 6de5a107..31fa32aa 100644 --- a/ucw/ff-unicode.c +++ b/ucw/ff-unicode.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/unicode.h" -#include "ucw/ff-unicode.h" -#include "ucw/ff-binary.h" +#include +#include +#include +#include +#include /*** UTF-8 ***/ diff --git a/ucw/ff-unicode.h b/ucw/ff-unicode.h index 44593440..024e54c8 100644 --- a/ucw/ff-unicode.h +++ b/ucw/ff-unicode.h @@ -12,8 +12,8 @@ #ifndef _UCW_FF_UNICODE_H #define _UCW_FF_UNICODE_H -#include "ucw/fastbuf.h" -#include "ucw/unicode.h" +#include +#include /* ** UTF-8 ** */ diff --git a/ucw/gary.c b/ucw/gary.c index 579d6ab1..69adde7e 100644 --- a/ucw/gary.c +++ b/ucw/gary.c @@ -6,8 +6,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/gary.h" +#include +#include #include diff --git a/ucw/getopt.c b/ucw/getopt.c index 61857184..3311237a 100644 --- a/ucw/getopt.c +++ b/ucw/getopt.c @@ -1,5 +1,5 @@ -#include "ucw/lib.h" -#include "ucw/getopt.h" +#include +#include void reset_getopt(void) diff --git a/ucw/getopt.h b/ucw/getopt.h index 43866fc4..6263d47f 100644 --- a/ucw/getopt.h +++ b/ucw/getopt.h @@ -12,7 +12,7 @@ #define _UCW_GETOPT_H #ifdef CONFIG_UCW_OWN_GETOPT -#include "ucw/getopt/getopt-sh.h" +#include #else #include #endif diff --git a/ucw/getopt/getopt-sh.h b/ucw/getopt/getopt-sh.h index 868ffce0..f296cd09 100644 --- a/ucw/getopt/getopt-sh.h +++ b/ucw/getopt/getopt-sh.h @@ -9,6 +9,6 @@ #define opterr ucw_opterr #define optopt ucw_optopt -#include "ucw/getopt/getopt.h" +#include #endif diff --git a/ucw/hash-test.c b/ucw/hash-test.c index 1f7aa711..8d1d76da 100644 --- a/ucw/hash-test.c +++ b/ucw/hash-test.c @@ -1,7 +1,7 @@ /* Tests for hash table routines */ -#include "ucw/lib.h" -#include "ucw/mempool.h" +#include +#include #include #include @@ -30,7 +30,7 @@ static inline void test1_init_data(struct node1 *n) #define HASH_WANT_LOOKUP #define HASH_WANT_REMOVE -#include "ucw/hashtable.h" +#include static void test1(void) { @@ -79,7 +79,7 @@ struct node2 { #define HASH_WANT_FIND #define HASH_WANT_NEW -#include "ucw/hashtable.h" +#include static void test2(void) { @@ -122,7 +122,7 @@ struct node3 { #define HASH_USE_POOL pool3 -#include "ucw/hashtable.h" +#include static void test3(void) { @@ -150,7 +150,7 @@ static void test3(void) /* TEST 4: complex keys */ -#include "ucw/hashfunc.h" +#include struct node4 { int port; @@ -195,7 +195,7 @@ static inline void test4_init_key(struct node4 *n, char *host, int port) n->port = port; } -#include "ucw/hashtable.h" +#include static void test4(void) { @@ -266,7 +266,7 @@ static inline void test5_init_data(struct test5_table *table UNUSED, struct node #define HASH_WANT_NEW #define HASH_WANT_DELETE -#include "ucw/hashtable.h" +#include static void test5(void) { diff --git a/ucw/hashfunc-test.c b/ucw/hashfunc-test.c index 8ff4fc0a..d68b0385 100644 --- a/ucw/hashfunc-test.c +++ b/ucw/hashfunc-test.c @@ -3,7 +3,7 @@ * it is faster than the classical version ;-) */ -#include "ucw/hashfunc.h" +#include #include #include diff --git a/ucw/hashfunc.c b/ucw/hashfunc.c index 2ea36570..ada2a43f 100644 --- a/ucw/hashfunc.c +++ b/ucw/hashfunc.c @@ -11,9 +11,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/hashfunc.h" -#include "ucw/chartype.h" +#include +#include +#include /* The number of bits the hash in the function hash_*() is rotated by after * every pass. It should be prime with the word size. */ diff --git a/ucw/hashfunc.h b/ucw/hashfunc.h index 355acd48..e3cfe4d8 100644 --- a/ucw/hashfunc.h +++ b/ucw/hashfunc.h @@ -11,7 +11,7 @@ #ifndef _UCW_HASHFUNC_H #define _UCW_HASHFUNC_H -#include "ucw/lib.h" +#include /*** === String hashes [[strhash]] ***/ diff --git a/ucw/hashtable.h b/ucw/hashtable.h index 622f071a..8dff51c2 100644 --- a/ucw/hashtable.h +++ b/ucw/hashtable.h @@ -121,7 +121,7 @@ * * (For dynamic tables, use HASH_FOR_ALL_DYNAMIC(hash_prefix, hash_table, variable) instead.) * - * Then include "ucw/hashtable.h" and voila, you have a hash table + * Then include and voila, you have a hash table * suiting all your needs (at least those which you've revealed :) ). * * After including this file, all parameter macros are automatically @@ -129,10 +129,10 @@ */ #ifndef _UCW_HASHFUNC_H -#include "ucw/hashfunc.h" +#include #endif -#include "ucw/prime.h" +#include #include @@ -340,7 +340,7 @@ static inline void P(cleanup_alloc) (TAU) { } #elif defined(HASH_USE_POOL) /* If the caller has requested to use his mempool, do so */ -#include "ucw/mempool.h" +#include static inline void * P(alloc) (TAUC unsigned int size) { return mp_alloc_fast(HASH_USE_POOL, size); } static inline void P(free) (TAUC void *x UNUSED) { } static inline void P(init_alloc) (TAU) { } @@ -348,7 +348,7 @@ static inline void P(cleanup_alloc) (TAU) { } #elif defined(HASH_AUTO_POOL) /* Use our own pools */ -#include "ucw/mempool.h" +#include static inline void * P(alloc) (TAUC unsigned int size) { return mp_alloc_fast(T.pool, size); } static inline void P(free) (TAUC void *x UNUSED) { } static inline void P(init_alloc) (TAU) { T.pool = mp_new(HASH_AUTO_POOL); } @@ -357,7 +357,7 @@ static inline void P(cleanup_alloc) (TAU) { mp_delete(T.pool); } #elif defined(HASH_USE_ELTPOOL) /* If the caller has requested to use his eltpool, do so */ -#include "ucw/eltpool.h" +#include static inline void * P(alloc) (TAUC unsigned int size UNUSED) { ASSERT(size <= (HASH_USE_ELTPOOL)->elt_size); return ep_alloc(HASH_USE_ELTPOOL); } static inline void P(free) (TAUC void *x) { ep_free(HASH_USE_ELTPOOL, x); } static inline void P(init_alloc) (TAU) { } @@ -365,7 +365,7 @@ static inline void P(cleanup_alloc) (TAU) { } #elif defined(HASH_AUTO_ELTPOOL) /* Use our own eltpools */ -#include "ucw/eltpool.h" +#include static inline void * P(alloc) (TAUC unsigned int size UNUSED) { return ep_alloc(T.eltpool); } static inline void P(free) (TAUC void *x) { ep_free(T.eltpool, x); } static inline void P(init_alloc) (TAU) { T.eltpool = ep_new(sizeof(P(bucket)), HASH_AUTO_ELTPOOL); } diff --git a/ucw/io-careful.c b/ucw/io-careful.c index 21b3678e..b12b7114 100644 --- a/ucw/io-careful.c +++ b/ucw/io-careful.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/io.h" +#include +#include #include diff --git a/ucw/io-mmap.c b/ucw/io-mmap.c index 30000b00..24010b51 100644 --- a/ucw/io-mmap.c +++ b/ucw/io-mmap.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/io.h" +#include +#include #include #include diff --git a/ucw/io-size.c b/ucw/io-size.c index 547aee56..35c8c51d 100644 --- a/ucw/io-size.c +++ b/ucw/io-size.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/io.h" +#include +#include ucw_off_t ucw_file_size(const char *name) { diff --git a/ucw/io-sync.c b/ucw/io-sync.c index 08ac93fa..00a3b5f2 100644 --- a/ucw/io-sync.c +++ b/ucw/io-sync.c @@ -4,8 +4,8 @@ * (c) 2004--2012 Martin Mares */ -#include "ucw/lib.h" -#include "ucw/io.h" +#include +#include #include #include diff --git a/ucw/ipaccess.c b/ucw/ipaccess.c index a01109c8..f51abab6 100644 --- a/ucw/ipaccess.c +++ b/ucw/ipaccess.c @@ -7,12 +7,12 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/clists.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" -#include "ucw/ipaccess.h" +#include +#include +#include +#include +#include +#include #include diff --git a/ucw/ipaccess.h b/ucw/ipaccess.h index fa163ea9..5ff6235f 100644 --- a/ucw/ipaccess.h +++ b/ucw/ipaccess.h @@ -10,7 +10,7 @@ #ifndef _UCW_IPACCESS_H #define _UCW_IPACCESS_H -#include "ucw/clists.h" +#include extern struct cf_section ipaccess_cf; int ipaccess_check(clist *l, u32 ip); diff --git a/ucw/kmp-test.c b/ucw/kmp-test.c index 038c6e75..49d4cf29 100644 --- a/ucw/kmp-test.c +++ b/ucw/kmp-test.c @@ -4,8 +4,8 @@ * (c) 2006, Pavel Charvat */ -#include "ucw/lib.h" -#include "ucw/mempool.h" +#include +#include #include #if 0 @@ -18,18 +18,18 @@ #define KMP_PREFIX(x) kmp1_##x #define KMP_WANT_CLEANUP -#include "ucw/kmp.h" +#include #define KMPS_PREFIX(x) kmp1s1_##x #define KMPS_KMP_PREFIX(x) kmp1_##x #define KMPS_WANT_BEST #define KMPS_EXIT(kmp,src,s) TRACE("Best match has %d characters", s->best->len) -#include "ucw/kmp-search.h" +#include #define KMPS_PREFIX(x) kmp1s2_##x #define KMPS_KMP_PREFIX(x) kmp1_##x #define KMPS_VARS uns count; #define KMPS_INIT(kmp,src,s) s->u.count = 0 #define KMPS_FOUND(kmp,src,s) s->u.count++ -#include "ucw/kmp-search.h" +#include static void test1(void) @@ -71,7 +71,7 @@ test1(void) #define KMPS_MERGE_CONTROLS #define KMPS_FOUND(kmp,src,s) TRACE("String %s with id %d found", s->out->u.str, s->out->u.id) #define KMPS_STEP(kmp,src,s) TRACE("Got to state %p after reading %d", s->s, s->c) -#include "ucw/kmp.h" +#include static void test2(void) @@ -106,7 +106,7 @@ test2(void) #define KMP_WANT_SEARCH #define KMPS_VARS uns sum, *cnt; #define KMPS_FOUND(kmp,src,s) do{ ASSERT(s->u.cnt[s->out->u.index]); s->u.cnt[s->out->u.index]--; s->u.sum--; }while(0) -#include "ucw/kmp.h" +#include static void test3(void) @@ -185,7 +185,7 @@ kmp4_hash(struct kmp4_struct *kmp UNUSED, struct kmp4_state *s, byte *c) #define KMPS_FOUND(kmp,src,s) TRACE("found") #define KMPS_ADD_CONTROLS #define KMPS_MERGE_CONTROLS -#include "ucw/kmp.h" +#include static void test4(void) diff --git a/ucw/kmp.h b/ucw/kmp.h index 629a4c84..673e0d3d 100644 --- a/ucw/kmp.h +++ b/ucw/kmp.h @@ -25,7 +25,7 @@ * #define KMP_WANT_CLEANUP * #define KMP_WANT_SEARCH // includes ucw/kmp-search.h automatically * #define KMPS_FOUND(kmp,src,s) printf("found\n") - * #include "ucw/kmp.h" + * #include * * [...] * @@ -108,7 +108,7 @@ #error Missing KMP_PREFIX #endif -#include "ucw/mempool.h" +#include #include #include @@ -240,7 +240,7 @@ P(hash_init_key) (struct P(hash_table) *t UNUSED, struct P(state) *s, struct P(s #endif #define HASH_CONSERVE_SPACE #define HASH_TABLE_DYNAMIC -#include "ucw/hashtable.h" +#include #define P(x) KMP_PREFIX(x) struct P(struct) { @@ -267,13 +267,13 @@ P(get_char) (struct P(struct) *kmp UNUSED, P(source_t) *src UNUSED, P(char_t) *c } #else # if defined(KMP_USE_UTF8) -# include "ucw/unicode.h" +# include # if defined(KMP_ONLYALPHA) || defined(KMP_TOLOWER) || defined(KMP_UNACCENT) -# include "charset/unicat.h" +# include # endif # elif defined(KMP_USE_ASCII) # if defined(KMP_ONLYALPHA) || defined(KMP_TOLOWER) -# include "ucw/chartype.h" +# include # endif # endif static inline int @@ -457,7 +457,7 @@ P(build) (struct P(struct) *kmp) # undef KMP_WANT_SEARCH # define KMPS_PREFIX(x) KMP_PREFIX(x) # define KMPS_KMP_PREFIX(x) KMP_PREFIX(x) -# include "ucw/kmp-search.h" +# include #endif #undef KMP_PREFIX diff --git a/ucw/lfs-test.c b/ucw/lfs-test.c index 8ef657d7..69db96a9 100644 --- a/ucw/lfs-test.c +++ b/ucw/lfs-test.c @@ -1,7 +1,7 @@ /* Test of large files */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" +#include +#include #include #include diff --git a/ucw/lib.h b/ucw/lib.h index 19a9c7a8..d94931d1 100644 --- a/ucw/lib.h +++ b/ucw/lib.h @@ -13,7 +13,7 @@ #ifndef _UCW_LIB_H #define _UCW_LIB_H -#include "ucw/config.h" +#include #include /*** === Macros for handling structures, offsets and alignment ***/ diff --git a/ucw/lizard-safe.c b/ucw/lizard-safe.c index c8fb9d75..42d73820 100644 --- a/ucw/lizard-safe.c +++ b/ucw/lizard-safe.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/threads.h" -#include "ucw/sighandler.h" -#include "ucw/lizard.h" +#include +#include +#include +#include #include #include diff --git a/ucw/lizard-test.c b/ucw/lizard-test.c index fb9830a6..74f898b5 100644 --- a/ucw/lizard-test.c +++ b/ucw/lizard-test.c @@ -1,8 +1,8 @@ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-binary.h" -#include "ucw/lizard.h" +#include +#include +#include +#include +#include #include #include #include diff --git a/ucw/lizard.c b/ucw/lizard.c index f505b946..56d653df 100644 --- a/ucw/lizard.c +++ b/ucw/lizard.c @@ -10,8 +10,8 @@ * the compression method is based on zlib. */ -#include "ucw/lib.h" -#include "ucw/lizard.h" +#include +#include #include diff --git a/ucw/log-conf.c b/ucw/log-conf.c index 7c7f97af..824d95fc 100644 --- a/ucw/log-conf.c +++ b/ucw/log-conf.c @@ -7,13 +7,13 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" -#include "ucw/log-internal.h" -#include "ucw/conf.h" -#include "ucw/simple-lists.h" -#include "ucw/tbf.h" -#include "ucw/threads.h" +#include +#include +#include +#include +#include +#include +#include #include #include @@ -342,7 +342,7 @@ log_configured(const char *name) #ifdef TEST #include -#include "ucw/getopt.h" +#include int main(int argc, char **argv) { diff --git a/ucw/log-file.c b/ucw/log-file.c index 231344bd..b00f5b3a 100644 --- a/ucw/log-file.c +++ b/ucw/log-file.c @@ -8,12 +8,12 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" -#include "ucw/log-internal.h" -#include "ucw/io.h" -#include "ucw/threads.h" -#include "ucw/simple-lists.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/ucw/log-internal.h b/ucw/log-internal.h index 5d21ce77..91c6c1fc 100644 --- a/ucw/log-internal.h +++ b/ucw/log-internal.h @@ -22,7 +22,7 @@ int log_pass_msg(int depth, struct log_stream *ls, struct log_msg *m); /* Define an array (growing buffer) for pointers to log_streams. */ #define GBUF_TYPE struct log_stream* #define GBUF_PREFIX(x) lsbuf_##x -#include "ucw/gbuf.h" +#include extern struct lsbuf_t log_streams; extern int log_streams_after; diff --git a/ucw/log-stream.c b/ucw/log-stream.c index 2cc9f7a0..5dbd71ff 100644 --- a/ucw/log-stream.c +++ b/ucw/log-stream.c @@ -8,10 +8,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" -#include "ucw/log-internal.h" -#include "ucw/simple-lists.h" +#include +#include +#include +#include #include diff --git a/ucw/log-syslog.c b/ucw/log-syslog.c index e3bbd6b5..ee8b9e83 100644 --- a/ucw/log-syslog.c +++ b/ucw/log-syslog.c @@ -8,8 +8,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" +#include +#include #include #include diff --git a/ucw/log.c b/ucw/log.c index 31252c9e..cf5d115a 100644 --- a/ucw/log.c +++ b/ucw/log.c @@ -8,10 +8,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" -#include "ucw/log-internal.h" -#include "ucw/simple-lists.h" +#include +#include +#include +#include #include #include diff --git a/ucw/log.h b/ucw/log.h index 5e8d4ef5..f6088bcb 100644 --- a/ucw/log.h +++ b/ucw/log.h @@ -11,7 +11,7 @@ #ifndef _UCW_LOG_H_ #define _UCW_LOG_H_ -#include "ucw/clists.h" +#include /*** === Messages and streams ***/ diff --git a/ucw/main-block.c b/ucw/main-block.c index dab3c8e6..929533b3 100644 --- a/ucw/main-block.c +++ b/ucw/main-block.c @@ -9,8 +9,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mainloop.h" +#include +#include #include #include diff --git a/ucw/main-rec.c b/ucw/main-rec.c index 1db9942b..ca313187 100644 --- a/ucw/main-rec.c +++ b/ucw/main-rec.c @@ -9,8 +9,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mainloop.h" +#include +#include #include #include diff --git a/ucw/main-test.c b/ucw/main-test.c index 0f7f6c8c..8e9f376c 100644 --- a/ucw/main-test.c +++ b/ucw/main-test.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mainloop.h" +#include +#include #include #include diff --git a/ucw/mainloop.c b/ucw/mainloop.c index 6eb60d47..a8bf0e5e 100644 --- a/ucw/mainloop.c +++ b/ucw/mainloop.c @@ -9,12 +9,12 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/heap.h" -#include "ucw/mainloop.h" -#include "ucw/threads.h" -#include "ucw/gary.h" -#include "ucw/process.h" +#include +#include +#include +#include +#include +#include #include #include diff --git a/ucw/mainloop.h b/ucw/mainloop.h index 18b060a8..51a3683a 100644 --- a/ucw/mainloop.h +++ b/ucw/mainloop.h @@ -10,8 +10,8 @@ #ifndef _UCW_MAINLOOP_H #define _UCW_MAINLOOP_H -#include "ucw/clists.h" -#include "ucw/process.h" +#include +#include #include diff --git a/ucw/md5.c b/ucw/md5.c index e692bf84..ee8e206b 100644 --- a/ucw/md5.c +++ b/ucw/md5.c @@ -15,8 +15,8 @@ * will fill a supplied 16-byte array with the digest. */ -#include "ucw/lib.h" -#include "ucw/md5.h" +#include +#include #include /* for memcpy() */ diff --git a/ucw/mempool-fmt.c b/ucw/mempool-fmt.c index ba0e7877..4f81dd8b 100644 --- a/ucw/mempool-fmt.c +++ b/ucw/mempool-fmt.c @@ -8,8 +8,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mempool.h" +#include +#include #include #include diff --git a/ucw/mempool-str.c b/ucw/mempool-str.c index cb246630..970c9f4e 100644 --- a/ucw/mempool-str.c +++ b/ucw/mempool-str.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mempool.h" +#include +#include #include #include diff --git a/ucw/mempool.c b/ucw/mempool.c index f776caaa..521724a8 100644 --- a/ucw/mempool.c +++ b/ucw/mempool.c @@ -10,8 +10,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/mempool.h" +#include +#include #include @@ -349,7 +349,7 @@ mp_pop(struct mempool *pool) #ifdef TEST -#include "ucw/getopt.h" +#include #include #include #include diff --git a/ucw/partmap.c b/ucw/partmap.c index fd9d9124..4f75f91e 100644 --- a/ucw/partmap.c +++ b/ucw/partmap.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/io.h" -#include "ucw/partmap.h" +#include +#include +#include #include #include diff --git a/ucw/prime.c b/ucw/prime.c index 12655492..75d0bf2b 100644 --- a/ucw/prime.c +++ b/ucw/prime.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/prime.h" +#include +#include static int /* Sequential search */ __isprime(uns x) /* We know x != 2 && x != 3 */ diff --git a/ucw/prime.h b/ucw/prime.h index 87d13f92..557dee54 100644 --- a/ucw/prime.h +++ b/ucw/prime.h @@ -17,7 +17,7 @@ #ifndef _UCW_PRIME_H #define _UCW_PRIME_H -#include "ucw/lib.h" +#include /* prime.c */ diff --git a/ucw/primetable.c b/ucw/primetable.c index 22cc1ec7..58ef62c9 100644 --- a/ucw/primetable.c +++ b/ucw/primetable.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/prime.h" -#include "ucw/binsearch.h" +#include +#include +#include /* A table of odd primes, each is about 1.2 times the previous one */ static uns prime_table[] = { diff --git a/ucw/proctitle.c b/ucw/proctitle.c index 1862f0b5..8810b0bf 100644 --- a/ucw/proctitle.c +++ b/ucw/proctitle.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/process.h" +#include +#include #include #include diff --git a/ucw/random.c b/ucw/random.c index bd9a1b30..899fdeb8 100644 --- a/ucw/random.c +++ b/ucw/random.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include diff --git a/ucw/realloc.c b/ucw/realloc.c index 66b001a2..3f2eff2b 100644 --- a/ucw/realloc.c +++ b/ucw/realloc.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include diff --git a/ucw/redblack-test.c b/ucw/redblack-test.c index cd0efee1..191473db 100644 --- a/ucw/redblack-test.c +++ b/ucw/redblack-test.c @@ -4,9 +4,9 @@ * (c) 2002, Robert Spalek */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/fastbuf.h" +#include +#include +#include #include #include diff --git a/ucw/redblack.h b/ucw/redblack.h index d2681914..bb3b09fc 100644 --- a/ucw/redblack.h +++ b/ucw/redblack.h @@ -129,7 +129,7 @@ * } * TREE_END_FOR; * - * Then include "ucw/redblack.h" and voila, you have a tree suiting all your + * Then include and voila, you have a tree suiting all your * needs (at least those which you've revealed :) ). * * After including this file, all parameter macros are automatically diff --git a/ucw/regex.c b/ucw/regex.c index 7b89818e..d149d60f 100644 --- a/ucw/regex.c +++ b/ucw/regex.c @@ -8,10 +8,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" -#include "ucw/hashfunc.h" -#include "ucw/regex.h" +#include +#include +#include +#include #include #include diff --git a/ucw/res-eltpool.c b/ucw/res-eltpool.c index b5480bfd..9accc2bb 100644 --- a/ucw/res-eltpool.c +++ b/ucw/res-eltpool.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" -#include "ucw/eltpool.h" +#include +#include +#include #include #include diff --git a/ucw/res-fd.c b/ucw/res-fd.c index 99d2dfcf..a948b052 100644 --- a/ucw/res-fd.c +++ b/ucw/res-fd.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" +#include +#include #include #include diff --git a/ucw/res-mem.c b/ucw/res-mem.c index a6b425f1..caa3a4ca 100644 --- a/ucw/res-mem.c +++ b/ucw/res-mem.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" +#include +#include #include #include diff --git a/ucw/res-mempool.c b/ucw/res-mempool.c index 74e5fa63..16bea86b 100644 --- a/ucw/res-mempool.c +++ b/ucw/res-mempool.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" -#include "ucw/mempool.h" +#include +#include +#include #include #include diff --git a/ucw/res-subpool.c b/ucw/res-subpool.c index c2ecbd09..85cbcce9 100644 --- a/ucw/res-subpool.c +++ b/ucw/res-subpool.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" +#include +#include #include diff --git a/ucw/resource.c b/ucw/resource.c index c4bed3ad..3fd163ae 100644 --- a/ucw/resource.c +++ b/ucw/resource.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/resource.h" -#include "ucw/mempool.h" +#include +#include +#include #include @@ -149,7 +149,7 @@ res_dump(struct resource *r, uns indent) #ifdef TEST -#include "ucw/fastbuf.h" +#include int main(void) { diff --git a/ucw/resource.h b/ucw/resource.h index d2a415c3..a4b8c88f 100644 --- a/ucw/resource.h +++ b/ucw/resource.h @@ -10,8 +10,8 @@ #ifndef _UCW_RESPOOL_H #define _UCW_RESPOOL_H -#include "ucw/clists.h" -#include "ucw/threads.h" +#include +#include /** * A resource pool. It contains a name of the pool (which is printed diff --git a/ucw/runcmd.c b/ucw/runcmd.c index 6f82d40e..fcc75468 100644 --- a/ucw/runcmd.c +++ b/ucw/runcmd.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/process.h" +#include +#include #include #include diff --git a/ucw/semaphore.h b/ucw/semaphore.h index a2bc8959..cd01512c 100644 --- a/ucw/semaphore.h +++ b/ucw/semaphore.h @@ -18,7 +18,7 @@ #include #include -#include "ucw/fastbuf.h" // For the temp_file_name +#include // For the temp_file_name /* In Darwin, sem_init() is unfortunately not implemented and the guide * recommends emulating it using sem_open(). */ diff --git a/ucw/sha1-hmac.c b/ucw/sha1-hmac.c index 182c891a..bc062ff5 100644 --- a/ucw/sha1-hmac.c +++ b/ucw/sha1-hmac.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/sha1.h" +#include +#include #include @@ -72,7 +72,7 @@ sha1_hmac(byte *outbuf, const byte *key, uns keylen, const byte *data, uns datal #ifdef TEST #include -#include "ucw/string.h" +#include static uns rd(char *dest) { diff --git a/ucw/sha1.c b/ucw/sha1.c index 5a547cbb..08e68b33 100644 --- a/ucw/sha1.c +++ b/ucw/sha1.c @@ -11,9 +11,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/sha1.h" -#include "ucw/unaligned.h" +#include +#include +#include #include @@ -288,7 +288,7 @@ sha1_hash_buffer(byte *outbuf, const byte *buffer, uns length) #include #include -#include "ucw/string.h" +#include int main(void) { diff --git a/ucw/shell/config.c b/ucw/shell/config.c index 02ae4b07..780ff792 100644 --- a/ucw/shell/config.c +++ b/ucw/shell/config.c @@ -17,15 +17,15 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/getopt.h" -#include "ucw/conf-internal.h" -#include "ucw/clists.h" -#include "ucw/mempool.h" -#include "ucw/chartype.h" -#include "ucw/bbuf.h" -#include "ucw/string.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ucw/shell/logger.c b/ucw/shell/logger.c index 7e88b4b6..4cb76876 100644 --- a/ucw/shell/logger.c +++ b/ucw/shell/logger.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/log.h" +#include +#include #include #include diff --git a/ucw/shell/logoutput.c b/ucw/shell/logoutput.c index aa0c2f47..ab8ca452 100644 --- a/ucw/shell/logoutput.c +++ b/ucw/shell/logoutput.c @@ -10,13 +10,13 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/log.h" -#include "ucw/mainloop.h" -#include "ucw/clists.h" -#include "ucw/getopt.h" -#include "ucw/conf.h" -#include "ucw/process.h" +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/ucw/sighandler.c b/ucw/sighandler.c index 8f117e76..2182e0cf 100644 --- a/ucw/sighandler.c +++ b/ucw/sighandler.c @@ -5,9 +5,9 @@ * (c) 2006 Martin Mares */ -#include "ucw/lib.h" -#include "ucw/threads.h" -#include "ucw/sighandler.h" +#include +#include +#include #include #include diff --git a/ucw/simple-lists.c b/ucw/simple-lists.c index bd214b58..25326d41 100644 --- a/ucw/simple-lists.c +++ b/ucw/simple-lists.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/conf.h" -#include "ucw/simple-lists.h" +#include +#include +#include +#include simp_node * simp_append(struct mempool *mp, clist *l) diff --git a/ucw/simple-lists.h b/ucw/simple-lists.h index 64b81901..99c501da 100644 --- a/ucw/simple-lists.h +++ b/ucw/simple-lists.h @@ -10,7 +10,7 @@ #ifndef _UCW_SIMPLE_LISTS_H #define _UCW_SIMPLE_LISTS_H -#include "ucw/clists.h" +#include /*** * To simplify very common usage of circular linked links, whose nodes can hold only one or two trivial values, diff --git a/ucw/slists.c b/ucw/slists.c index d1501d74..7fb63ad9 100644 --- a/ucw/slists.c +++ b/ucw/slists.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/slists.h" +#include +#include static inline snode * slist_raw_prev(slist *l, snode *n) diff --git a/ucw/sorter/array.c b/ucw/sorter/array.c index 53505d2a..819898a3 100644 --- a/ucw/sorter/array.c +++ b/ucw/sorter/array.c @@ -9,8 +9,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/sorter/common.h" +#include +#include #include #include @@ -67,9 +67,9 @@ asort_radix(struct asort_context *ctx, void *array, void *buffer, uns num_elts, #ifdef CONFIG_UCW_THREADS -#include "ucw/threads.h" -#include "ucw/workqueue.h" -#include "ucw/eltpool.h" +#include +#include +#include static uns asort_threads_use_count; static uns asort_threads_ready; diff --git a/ucw/sorter/array.h b/ucw/sorter/array.h index e6e0199d..723dbb12 100644 --- a/ucw/sorter/array.h +++ b/ucw/sorter/array.h @@ -43,7 +43,7 @@ * If you do not use hashing, these parameters should be omitted. */ -#include "ucw/sorter/common.h" +#include #define Q(x) ASORT_PREFIX(x) diff --git a/ucw/sorter/common.h b/ucw/sorter/common.h index a91050b3..78d9187b 100644 --- a/ucw/sorter/common.h +++ b/ucw/sorter/common.h @@ -10,7 +10,7 @@ #ifndef _UCW_SORTER_COMMON_H #define _UCW_SORTER_COMMON_H -#include "ucw/clists.h" +#include /* Configuration variables */ extern uns sorter_trace, sorter_trace_array, sorter_stream_bufsize; diff --git a/ucw/sorter/config.c b/ucw/sorter/config.c index 4b3bd921..bdcd544f 100644 --- a/ucw/sorter/config.c +++ b/ucw/sorter/config.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/fastbuf.h" -#include "ucw/sorter/common.h" +#include +#include +#include +#include uns sorter_trace; uns sorter_trace_array; diff --git a/ucw/sorter/debug/radix-asio-test.c b/ucw/sorter/debug/radix-asio-test.c index 8e3368b0..6996766a 100644 --- a/ucw/sorter/debug/radix-asio-test.c +++ b/ucw/sorter/debug/radix-asio-test.c @@ -4,10 +4,10 @@ * (c) 2007 Martin Mares */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/io.h" -#include "ucw/asio.h" +#include +#include +#include +#include #include #include diff --git a/ucw/sorter/debug/radix-file-test.c b/ucw/sorter/debug/radix-file-test.c index 11f32dd6..2e2b60f8 100644 --- a/ucw/sorter/debug/radix-file-test.c +++ b/ucw/sorter/debug/radix-file-test.c @@ -4,9 +4,9 @@ * (c) 2007 Martin Mares */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/io.h" +#include +#include +#include #include #include diff --git a/ucw/sorter/debug/retros.c b/ucw/sorter/debug/retros.c index 7bb692f6..c25a2858 100644 --- a/ucw/sorter/debug/retros.c +++ b/ucw/sorter/debug/retros.c @@ -5,9 +5,9 @@ */ #include "sherlock/sherlock.h" -#include "ucw/getopt.h" -#include "ucw/md5.h" -#include "ucw/heap.h" +#include +#include +#include #include #include @@ -51,13 +51,13 @@ static int comp_ind(const void *x, const void *y) #define ASORT_ELT(i) a[i].key #define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0) #define ASORT_EXTRA_ARGS , struct elt *a -#include "ucw/sorter/array-simple.h" +#include #define ASORT_PREFIX(x) asi_##x #define ASORT_KEY_TYPE u32 #define ASORT_ELT(i) ind[i]->key #define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0) -#include "ucw/sorter/array-simple.h" +#include static void r1_sort(void) { diff --git a/ucw/sorter/govern.c b/ucw/sorter/govern.c index b54d0786..b6b723c2 100644 --- a/ucw/sorter/govern.c +++ b/ucw/sorter/govern.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/mempool.h" -#include "ucw/stkstring.h" -#include "ucw/sorter/common.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/sorter/s-fixint.h b/ucw/sorter/s-fixint.h index 6ab0924b..26edaf5f 100644 --- a/ucw/sorter/s-fixint.h +++ b/ucw/sorter/s-fixint.h @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/stkstring.h" +#include #define ASORT_PREFIX(x) SORT_PREFIX(array_##x) #define ASORT_KEY_TYPE P(key) @@ -18,7 +18,7 @@ # define ASORT_LONG_HASH # endif #endif -#include "ucw/sorter/array.h" +#include /* * This is a more efficient implementation of the internal sorter, diff --git a/ucw/sorter/s-internal.h b/ucw/sorter/s-internal.h index 0653a220..cda744b9 100644 --- a/ucw/sorter/s-internal.h +++ b/ucw/sorter/s-internal.h @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/stkstring.h" +#include #ifdef SORT_INTERNAL_RADIX /* Keep copies of the items' hashes to save cache misses */ @@ -42,7 +42,7 @@ typedef struct { # define ASORT_LONG_HASH # endif #endif -#include "ucw/sorter/array.h" +#include /* * The big_buf has the following layout: diff --git a/ucw/sorter/sbuck.c b/ucw/sorter/sbuck.c index 875b0e1f..7cedee96 100644 --- a/ucw/sorter/sbuck.c +++ b/ucw/sorter/sbuck.c @@ -7,11 +7,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/fastbuf.h" -#include "ucw/mempool.h" -#include "ucw/stkstring.h" -#include "ucw/sorter/common.h" +#include +#include +#include +#include +#include #include diff --git a/ucw/sorter/sort-test.c b/ucw/sorter/sort-test.c index fcd782a8..98eb9f7e 100644 --- a/ucw/sorter/sort-test.c +++ b/ucw/sorter/sort-test.c @@ -7,15 +7,15 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/conf.h" -#include "ucw/fastbuf.h" -#include "ucw/ff-binary.h" -#include "ucw/hashfunc.h" -#include "ucw/md5.h" -#include "ucw/string.h" -#include "ucw/prime.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -63,7 +63,7 @@ struct key1 { #define SORT_INT(k) (k).x #define SORT_DELETE_INPUT 0 -#include "ucw/sorter/sorter.h" +#include static void test_int(int mode, u64 size) @@ -112,7 +112,7 @@ static inline void s2_write_merged(struct fastbuf *f, struct key2 **k, void **d #define SORT_UNIFY #define SORT_INT(k) (k).x -#include "ucw/sorter/sorter.h" +#include static void test_counted(int mode, u64 size) @@ -180,7 +180,7 @@ static inline uns s3_hash(struct key3 *x) #define SORT_OUTPUT_FB #define SORT_HASH_BITS 32 -#include "ucw/sorter/sorter.h" +#include static void gen_hash_key(int mode, struct key3 *k, uns i) @@ -288,7 +288,7 @@ static inline void s4_write_key(struct fastbuf *f, struct key4 *x) #define SORT_INPUT_FB #define SORT_OUTPUT_FB -#include "ucw/sorter/sorter.h" +#include #define s4b_compare s4_compare #define s4b_read_key s4_read_key @@ -306,7 +306,7 @@ static inline uns s4_data_size(struct key4 *x) #define SORT_INPUT_FB #define SORT_OUTPUT_FB -#include "ucw/sorter/sorter.h" +#include static void gen_key4(struct key4 *k) @@ -409,7 +409,7 @@ static int s5_gen(struct s5_pair *p) #define ASORT_PREFIX(x) s5m_##x #define ASORT_KEY_TYPE u32 -#include "ucw/sorter/array-simple.h" +#include static void s5_write_merged(struct fastbuf *f, struct key5 **keys, void **data, uns n, void *buf) { @@ -461,7 +461,7 @@ static inline int s5p_lt(struct s5_pair x, struct s5_pair y) #define ASORT_PREFIX(x) s5p_##x #define ASORT_KEY_TYPE struct s5_pair #define ASORT_LT(x,y) s5p_lt(x,y) -#include "ucw/sorter/array.h" +#include static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) { @@ -496,7 +496,7 @@ static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) #define SORT_OUTPUT_THIS_FB #define SORT_INT(k) (k).x -#include "ucw/sorter/sorter.h" +#include #define SORT_KEY_REGULAR struct key5 #define SORT_PREFIX(x) s5b_##x @@ -509,7 +509,7 @@ static int s5_presort(struct fastbuf *dest, void *buf, size_t bufsize) #define s5b_write_merged s5_write_merged #define s5b_copy_merged s5_copy_merged -#include "ucw/sorter/sorter.h" +#include static void test_graph(uns mode, u64 size) @@ -578,7 +578,7 @@ struct key6 { #define SORT_UNIQUE #define SORT_INT64(k) (k).x -#include "ucw/sorter/sorter.h" +#include static void test_int64(int mode, u64 size) diff --git a/ucw/sorter/sorter.h b/ucw/sorter/sorter.h index 568ced03..47adc24b 100644 --- a/ucw/sorter/sorter.h +++ b/ucw/sorter/sorter.h @@ -114,8 +114,8 @@ * undef'd. */ -#include "ucw/sorter/common.h" -#include "ucw/fastbuf.h" +#include +#include #include @@ -205,17 +205,17 @@ static inline void P(copy_merged)(P(key) **keys, struct fastbuf **data UNUSED, u #if defined(SORT_HASH_BITS) || defined(SORT_INT) #define SORT_INTERNAL_RADIX -#include "ucw/sorter/s-radix.h" +#include #endif #if defined(SORT_VAR_KEY) || defined(SORT_VAR_DATA) || defined(SORT_UNIFY_WORKSPACE) -#include "ucw/sorter/s-internal.h" +#include #else -#include "ucw/sorter/s-fixint.h" +#include #endif -#include "ucw/sorter/s-twoway.h" -#include "ucw/sorter/s-multiway.h" +#include +#include static struct fastbuf *P(sort)( #ifdef SORT_INPUT_FILE diff --git a/ucw/stkstring.c b/ucw/stkstring.c index 32bd9743..fee05ab2 100644 --- a/ucw/stkstring.c +++ b/ucw/stkstring.c @@ -9,9 +9,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/stkstring.h" -#include "ucw/string.h" +#include +#include +#include #include diff --git a/ucw/stkstring.h b/ucw/stkstring.h index 5cd2c6b8..62f9a514 100644 --- a/ucw/stkstring.h +++ b/ucw/stkstring.h @@ -15,7 +15,7 @@ #include #include #include -#include "ucw/string.h" +#include #define stk_strdup(s) ({ const char *_s=(s); uns _l=strlen(_s)+1; char *_x=alloca(_l); memcpy(_x, _s, _l); _x; }) #define stk_strndup(s,n) ({ const char *_s=(s); uns _l=strnlen(_s,(n)); char *_x=alloca(_l+1); memcpy(_x, _s, _l); _x[_l]=0; _x; }) diff --git a/ucw/str-esc.c b/ucw/str-esc.c index 1796a704..551148e3 100644 --- a/ucw/str-esc.c +++ b/ucw/str-esc.c @@ -10,9 +10,9 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/string.h" -#include "ucw/chartype.h" +#include +#include +#include #include char * diff --git a/ucw/str-fix.c b/ucw/str-fix.c index a220f621..01f69c0a 100644 --- a/ucw/str-fix.c +++ b/ucw/str-fix.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/string.h" +#include +#include #include diff --git a/ucw/str-hex.c b/ucw/str-hex.c index 57c3500a..c71c23e6 100644 --- a/ucw/str-hex.c +++ b/ucw/str-hex.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/string.h" -#include "ucw/chartype.h" +#include +#include +#include static uns hex_make(uns x) diff --git a/ucw/str-imatch.c b/ucw/str-imatch.c index 9d7de57a..84327fc8 100644 --- a/ucw/str-imatch.c +++ b/ucw/str-imatch.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" +#include +#include #define Convert(x) Cupcase(x) #define MATCH_FUNC_NAME str_match_pattern_nocase -#include "ucw/str-match.h" +#include diff --git a/ucw/str-match.c b/ucw/str-match.c index ca91141b..1aa61d6b 100644 --- a/ucw/str-match.c +++ b/ucw/str-match.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #define Convert(x) (x) #define MATCH_FUNC_NAME str_match_pattern -#include "ucw/str-match.h" +#include diff --git a/ucw/str-match.h b/ucw/str-match.h index 7b000c7c..776cb6f4 100644 --- a/ucw/str-match.h +++ b/ucw/str-match.h @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/string.h" +#include int MATCH_FUNC_NAME(const char *p, const char *s) diff --git a/ucw/str-split.c b/ucw/str-split.c index 0bb23600..40138362 100644 --- a/ucw/str-split.c +++ b/ucw/str-split.c @@ -8,9 +8,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" -#include "ucw/string.h" +#include +#include +#include #include diff --git a/ucw/string.c b/ucw/string.c index 0ccbdfb5..bb1fae1a 100644 --- a/ucw/string.c +++ b/ucw/string.c @@ -10,8 +10,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/string.h" +#include +#include #ifdef CONFIG_DARWIN uns diff --git a/ucw/strtonum-test.c b/ucw/strtonum-test.c index 6fa6f23a..1bd8faf2 100644 --- a/ucw/strtonum-test.c +++ b/ucw/strtonum-test.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/chartype.h" -#include "ucw/strtonum.h" +#include +#include +#include #include diff --git a/ucw/strtonum.c b/ucw/strtonum.c index 1d6cd1cd..db4ab595 100644 --- a/ucw/strtonum.c +++ b/ucw/strtonum.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/string.h" -#include "ucw/chartype.h" -#include "ucw/strtonum.h" +#include +#include +#include +#include static uns detect_base(const char **pp, const uns flags) { @@ -100,8 +100,8 @@ static inline uns get_digit(const uns c) #define STN_TYPE uns #define STN_SUFFIX uns -#include "ucw/strtonum-gen.h" +#include #define STN_TYPE uintmax_t #define STN_SUFFIX uintmax -#include "ucw/strtonum-gen.h" +#include diff --git a/ucw/tbf.c b/ucw/tbf.c index 9f8404e1..b0bcbc16 100644 --- a/ucw/tbf.c +++ b/ucw/tbf.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/tbf.h" +#include +#include void tbf_init(struct token_bucket_filter *f) diff --git a/ucw/tempfile.c b/ucw/tempfile.c index f616990a..27ade343 100644 --- a/ucw/tempfile.c +++ b/ucw/tempfile.c @@ -8,11 +8,11 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/conf.h" -#include "ucw/threads.h" -#include "ucw/io.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include +#include #include #include @@ -88,7 +88,7 @@ open_tmp(char *name_buf, int open_flags, int mode) #ifdef TEST -#include "ucw/getopt.h" +#include int main(int argc, char **argv) { diff --git a/ucw/threads-conf.c b/ucw/threads-conf.c index 39a3e738..b96f867f 100644 --- a/ucw/threads-conf.c +++ b/ucw/threads-conf.c @@ -7,9 +7,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/threads.h" -#include "ucw/conf.h" +#include +#include +#include uns ucwlib_thread_stack_size = 65556; diff --git a/ucw/threads.c b/ucw/threads.c index 0cc958f6..bd242310 100644 --- a/ucw/threads.c +++ b/ucw/threads.c @@ -7,8 +7,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/threads.h" +#include +#include #ifdef CONFIG_UCW_THREADS diff --git a/ucw/threads.h b/ucw/threads.h index 8b225bee..de1fa306 100644 --- a/ucw/threads.h +++ b/ucw/threads.h @@ -10,7 +10,7 @@ #ifndef _UCW_THREADS_H #define _UCW_THREADS_H -#include "ucw/sighandler.h" +#include /* This structure holds per-thread data */ diff --git a/ucw/timer.c b/ucw/timer.c index f653ee56..3e680bc1 100644 --- a/ucw/timer.c +++ b/ucw/timer.c @@ -7,7 +7,7 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" +#include #include #include diff --git a/ucw/trans.c b/ucw/trans.c index 4f04dac4..db883837 100644 --- a/ucw/trans.c +++ b/ucw/trans.c @@ -9,10 +9,10 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/trans.h" -#include "ucw/resource.h" -#include "ucw/mempool.h" +#include +#include +#include +#include #include diff --git a/ucw/trans.h b/ucw/trans.h index 15a08fd1..e5e32848 100644 --- a/ucw/trans.h +++ b/ucw/trans.h @@ -10,7 +10,7 @@ #ifndef _UCW_TRANS_H #define _UCW_TRANS_H -#include "ucw/mempool.h" +#include #include diff --git a/ucw/trie-test.c b/ucw/trie-test.c index cb9058c4..a392bfa5 100644 --- a/ucw/trie-test.c +++ b/ucw/trie-test.c @@ -9,8 +9,8 @@ #undef LOCAL_DEBUG -#include "ucw/lib.h" -#include "ucw/getopt.h" +#include +#include #include #include @@ -26,7 +26,7 @@ #ifdef LOCAL_DEBUG #define TRIE_TRACE #endif -#include "ucw/trie.h" +#include static void basic_test(void) @@ -55,7 +55,7 @@ basic_test(void) #ifdef LOCAL_DEBUG #define TRIE_TRACE #endif -#include "ucw/trie.h" +#include static void dynamic_test(void) @@ -86,7 +86,7 @@ dynamic_test(void) #ifdef LOCAL_DEBUG #define TRIE_TRACE #endif -#include "ucw/trie.h" +#include #define MAX_STRINGS 200 diff --git a/ucw/trie.h b/ucw/trie.h index 6363a213..3e577750 100644 --- a/ucw/trie.h +++ b/ucw/trie.h @@ -43,8 +43,8 @@ #ifndef _SHERLOCK_UCW_TRIE_H #define _SHERLOCK_UCW_TRIE_H -#include "ucw/eltpool.h" -#include "ucw/hashfunc.h" +#include +#include #include diff --git a/ucw/unicode.c b/ucw/unicode.c index 8d537f54..1dc29e12 100644 --- a/ucw/unicode.c +++ b/ucw/unicode.c @@ -8,8 +8,8 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/unicode.h" +#include +#include uns utf8_strlen(const byte *str) diff --git a/ucw/unicode.h b/ucw/unicode.h index 8b88fc45..8d8fc46e 100644 --- a/ucw/unicode.h +++ b/ucw/unicode.h @@ -12,7 +12,7 @@ #ifndef _UCW_UNICODE_H #define _UCW_UNICODE_H -#include "ucw/unaligned.h" +#include /* Macros for handling UTF-8 */ diff --git a/ucw/url.c b/ucw/url.c index a14d5e49..6d940018 100644 --- a/ucw/url.c +++ b/ucw/url.c @@ -10,11 +10,11 @@ * XXX: The buffer handling in this module is really horrible, but it works. */ -#include "ucw/lib.h" -#include "ucw/url.h" -#include "ucw/chartype.h" -#include "ucw/conf.h" -#include "ucw/prime.h" +#include +#include +#include +#include +#include #include #include diff --git a/ucw/utils/basecode.c b/ucw/utils/basecode.c index 892e883a..5990a9a3 100644 --- a/ucw/utils/basecode.c +++ b/ucw/utils/basecode.c @@ -11,11 +11,11 @@ #include #include -#include "ucw/lib.h" -#include "ucw/base64.h" -#include "ucw/base224.h" -#include "ucw/fastbuf.h" -#include "ucw/getopt.h" +#include +#include +#include +#include +#include static struct option opts[] = { { "encode64", 0, 0, 'e' }, diff --git a/ucw/utils/daemon-helper.c b/ucw/utils/daemon-helper.c index 6146aabb..9996e81f 100644 --- a/ucw/utils/daemon-helper.c +++ b/ucw/utils/daemon-helper.c @@ -13,7 +13,7 @@ * 102 not running */ -#include "ucw/lib.h" +#include #include #include diff --git a/ucw/utils/urltool.c b/ucw/utils/urltool.c index 5bcb33ca..a9ac197e 100644 --- a/ucw/utils/urltool.c +++ b/ucw/utils/urltool.c @@ -4,10 +4,10 @@ * (c) 2004 Martin Mares */ -#include "ucw/lib.h" -#include "ucw/getopt.h" -#include "ucw/url.h" -#include "ucw/fastbuf.h" +#include +#include +#include +#include #include #include diff --git a/ucw/wildmatch.c b/ucw/wildmatch.c index 34fb66f5..3df4920a 100644 --- a/ucw/wildmatch.c +++ b/ucw/wildmatch.c @@ -9,9 +9,9 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/mempool.h" -#include "ucw/wildmatch.h" +#include +#include +#include #include #include diff --git a/ucw/workqueue.c b/ucw/workqueue.c index 2dd58c9e..732160bb 100644 --- a/ucw/workqueue.c +++ b/ucw/workqueue.c @@ -7,10 +7,10 @@ * of the GNU Lesser General Public License. */ -#include "ucw/lib.h" -#include "ucw/threads.h" -#include "ucw/workqueue.h" -#include "ucw/heap.h" +#include +#include +#include +#include static void * worker_thread_init(void *arg) diff --git a/ucw/workqueue.h b/ucw/workqueue.h index bf2b8dac..4030a8f6 100644 --- a/ucw/workqueue.h +++ b/ucw/workqueue.h @@ -29,8 +29,8 @@ * until all of them finish. */ -#include "ucw/semaphore.h" -#include "ucw/clists.h" +#include +#include #include -- 2.39.2