Remove obsolete references to Sherlock

diff --git a/build/Makefile b/build/Makefile
index 54698d2f09ea0fa6ac742a800b22a79683af194f..8c7096188c696176a15965e989c717e014dd5627 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,4 +1,4 @@
-# Makefile for Sherlock Build Tools
+# Makefile for LibUCW Build Tools
 
 DIRS+=build
 

diff --git a/charset/fb-charconv.c b/charset/fb-charconv.c
index c1701e55c6fb93d9b9fc7f772d631b895b71c2b0..c4c6b257e154493f6d3ab31b41ec05cb0aeb6291 100644 (file)
--- a/charset/fb-charconv.c
+++ b/charset/fb-charconv.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Charset Conversion Wrapper for Fast Buffered I/O
+ *     UCW Library -- Charset Conversion Wrapper for Fast Buffered I/O
  *
  *     (c) 2003--2005 Martin Mares <mj@ucw.cz>
  *

diff --git a/charset/fb-charconv.h b/charset/fb-charconv.h
index 013484710984115e9c42571d6eaf423f9aa5d1a0..412c6929b6b7e4c7e2a3c2646577cfe0ad05b8e9 100644 (file)
--- a/charset/fb-charconv.h
+++ b/charset/fb-charconv.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Charset Conversion Wrapper for Fast Buffered I/O
+ *     UCW Library -- Charset Conversion Wrapper for Fast Buffered I/O
  *
  *     (c) 2003--2005 Martin Mares <mj@ucw.cz>
  *

diff --git a/charset/mp-charconv.c b/charset/mp-charconv.c
index 642ff81e4557cef54c2793a8714fb311163282f1..48b08ad6776f32a0d465ab817f580c261be14706 100644 (file)
--- a/charset/mp-charconv.c
+++ b/charset/mp-charconv.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Character Conversion with Allocation on a Memory Pool
+ *     UCW Library -- Character Conversion with Allocation on a Memory Pool
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/charset/mp-charconv.h b/charset/mp-charconv.h
index 5401d4f308955cd8326f057184e4a9571f910b71..d31f271edc7008047c6bcf3996631c01505de642 100644 (file)
--- a/charset/mp-charconv.h
+++ b/charset/mp-charconv.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Character Conversion with Allocation on a Memory Pool
+ *     UCW Library -- Character Conversion with Allocation on a Memory Pool
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/charset/stk-charconv.c b/charset/stk-charconv.c
index e296c73bcfa04a8eec59c6fdb1df2f38fd60bd9b..b6359d4ccf02c0428e8d25439d0dc1ae96f54a66 100644 (file)
--- a/charset/stk-charconv.c
+++ b/charset/stk-charconv.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Character Conversion with Allocation on the Stack
+ *     UCW Library -- Character Conversion with Allocation on the Stack
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/charset/stk-charconv.h b/charset/stk-charconv.h
index e6852c7762cd75c9437af6a05d9df4ef91bcee95..a1d40dde90bcae54d96f924ff3453f0d62193f77 100644 (file)
--- a/charset/stk-charconv.h
+++ b/charset/stk-charconv.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- Character Conversion with Allocation on the Stack
+ *     UCW Library -- Character Conversion with Allocation on the Stack
  *
  *     (c) 2006 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/ucw/getopt/README b/ucw/getopt/README
index fe24015a5ce6899c9773fbca813e09fb2a17679d..98692be224160fca9073d23e020b11b9c33ab517 100644 (file)
--- a/ucw/getopt/README
+++ b/ucw/getopt/README
@@ -5,7 +5,7 @@ no standardized interface for such instruction.
 They are distributed under the GNU LGPL.
 
 All files are exact copies of the original distribution with very
-few exceptions commented with `// SHERLOCK' prefix.
+few exceptions commented with `// UCW' prefix.
 I only provided my own getopt-sh.c, getopt-sh.h and Makefile.
 
                                         Pavel Charvat, 2007

diff --git a/ucw/getopt/getopt.c b/ucw/getopt/getopt.c
index 1e13775af01b43520920c47d311c59925034440c..13c31701cfb16657eafc7c6b6ca41beb1208f736 100644 (file)
--- a/ucw/getopt/getopt.c
+++ b/ucw/getopt/getopt.c
@@ -45,7 +45,7 @@
 #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
 # include <gnu-versions.h>
 # if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-//#  define ELIDE_CODE   // SHERLOCK: disabled
+//#  define ELIDE_CODE   // UCW: disabled
 # endif
 #endif
 
@@ -70,7 +70,7 @@
 #ifdef _LIBC
 # include <libintl.h>
 #else
-//# include "gettext.h"  // SHERLOCK: replaced by <libintl.h>
+//# include "gettext.h"  // UCW: replaced by <libintl.h>
 # include <libintl.h>
 # define _(msgid) gettext (msgid)
 #endif

diff --git a/ucw/getopt/getopt1.c b/ucw/getopt/getopt1.c
index 0ea9536976d34744657ea933ee91667d5b5c2cdf..ee0d6faefaeec789035893276b080e020235c443 100644 (file)
--- a/ucw/getopt/getopt1.c
+++ b/ucw/getopt/getopt1.c
@@ -43,7 +43,7 @@
 #if !defined _LIBC && defined __GLIBC__ && __GLIBC__ >= 2
 #include <gnu-versions.h>
 #if _GNU_GETOPT_INTERFACE_VERSION == GETOPT_INTERFACE_VERSION
-//#define ELIDE_CODE // SHERLOCK: disabled
+//#define ELIDE_CODE // UCW: disabled
 #endif
 #endif
 

diff --git a/ucw/perl/Filelock/MANIFEST b/ucw/perl/Filelock/MANIFEST
index c70159f8e6dbbd76368f92ce2a7bde06b8e618c4..f921f06470373bcbae8b526d69794694ad7c7043 100644 (file)
--- a/ucw/perl/Filelock/MANIFEST
+++ b/ucw/perl/Filelock/MANIFEST
@@ -3,4 +3,4 @@ Makefile.PL
 MANIFEST
 Fcntllock.pm
 Fcntllock.xs
-lib/Sherlock/.exists
+lib/UCW/.exists

diff --git a/ucw/perl/UCW/Config.pm b/ucw/perl/UCW/Config.pm
index 552690caccea76fa85eeb8feb2a1dfff67125e4a..6e79fc135819f882ce994636b854fd11007e5a62 100644 (file)
--- a/ucw/perl/UCW/Config.pm
+++ b/ucw/perl/UCW/Config.pm
@@ -1,4 +1,4 @@
-#      Perl module for parsing Sherlock configuration files (using the config utility)
+#      Perl module for parsing LibUCW configuration files (using the ucw-config utility)
 #
 #      (c) 2002--2005 Martin Mares <mj@ucw.cz>
 #

diff --git a/ucw/perl/Ulimit/MANIFEST b/ucw/perl/Ulimit/MANIFEST
index cfc357e72b13bed533e872c328aeda34400dc2dc..b015b4a07700f91abe9ce065c95d0ec4b804946d 100644 (file)
--- a/ucw/perl/Ulimit/MANIFEST
+++ b/ucw/perl/Ulimit/MANIFEST
@@ -3,4 +3,4 @@ Makefile.PL
 MANIFEST
 Ulimit.pm
 Ulimit.xs
-lib/Sherlock/.exists
+lib/UCW/.exists

diff --git a/ucw/sorter/debug/radix-tune-bits.sh b/ucw/sorter/debug/radix-tune-bits.sh
index dbaa49c1a887d75240051287774be02002bf5ff4..53cf6f069105ebe18e1a7bc625547afe5640b5bb 100644 (file)
--- a/ucw/sorter/debug/radix-tune-bits.sh
+++ b/ucw/sorter/debug/radix-tune-bits.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-# An utility for tuning the Sherlock's radix sorter
+# An utility for tuning the LibUCW radix sorter
 # (c) 2007 Martin Mares <mj@ucw.cz>
 set -e
 UCW_PROGNAME="$0"
 . lib/libucw.sh
 
-# Path to Sherlock build directory
+# Path to LibUCW build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to LibUCW build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'

diff --git a/ucw/sorter/debug/radix-tune-thresh.sh b/ucw/sorter/debug/radix-tune-thresh.sh
index 71d929b3e316b841ec02d294f500295b3d301d43..387d22184240fab8407fce021f51340438759135 100644 (file)
--- a/ucw/sorter/debug/radix-tune-thresh.sh
+++ b/ucw/sorter/debug/radix-tune-thresh.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
-# An utility for tuning the Sherlock's radix sorter threshold
+# An utility for tuning the LibUCW radix sorter threshold
 # (c) 2007 Martin Mares <mj@ucw.cz>
 set -e
 UCW_PROGNAME="$0"
 . lib/libucw.sh
 
-# Path to Sherlock build directory
+# Path to LibUCW build directory
 [ -n "$BUILD" ] || BUILD=..
-[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to Sherlock build directory"
+[ -f "$BUILD/ucw/sorter/sorter.h" ] || die "BUILD does not point to LibUCW build directory"
 
 # Find out sort buffer size
 parse-config 'Sorter{##SortBuffer}'
@@ -16,7 +16,7 @@ SORTBUF=$CF_Sorter_SortBuffer
 log "Detected sort buffer size $SORTBUF"
 
 # Find out radix-sorter width
-[ -f "$BUILD/obj/config.mk" ] || die "Sherlock source not configured"
+[ -f "$BUILD/obj/config.mk" ] || die "LibUCW source not configured"
 WIDTH=`sed <$BUILD/obj/config.mk 's/^CONFIG_UCW_RADIX_SORTER_BITS=\(.*\)/\1/;t;d'`
 [ -n "$WIDTH" ] || die "CONFIG_UCW_RADIX_SORTER_BITS not set (!?)"
 log "Detected radix-sorter width $WIDTH"

diff --git a/ucw/utils/ucw-rotate-log.pl b/ucw/utils/ucw-rotate-log.pl
index 6d5ae0b8a1daa0a1c718aa38ad16cfc6521a1635..4d4be667377f0ef482aa15992bc0fb0e5ea6a6eb 100644 (file)
--- a/ucw/utils/ucw-rotate-log.pl
+++ b/ucw/utils/ucw-rotate-log.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-#      Rotate Sherlock logs
+#      LibUCW Utilities -- Rotate logs
 #      (c) 2001--2002 Martin Mares <mj@ucw.cz>
 
 use File::stat;

diff --git a/ucw/utils/ucw-urltool.c b/ucw/utils/ucw-urltool.c
index f25b70c5b323d6cba6aab52168b44f178ed78298..057b4035f30b22820c52aba4e9d47bbcaac4da9f 100644 (file)
--- a/ucw/utils/ucw-urltool.c
+++ b/ucw/utils/ucw-urltool.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Utilities -- URL Handling Tool
+ *     LibUCW Utilities -- URL Handling Tool
  *
  *     (c) 2004 Martin Mares <mj@ucw.cz>
  */

diff --git a/xml/common.c b/xml/common.c
index 89b848cfcf8404217a7e99eea9ce66b0a1893d5f..7f120d85c3e1da82e73dfb28a49f693420979bed 100644 (file)
--- a/xml/common.c
+++ b/xml/common.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/xml/dtd.c b/xml/dtd.c
index 84bbff7c9c5841adfe1b7d85114e24584b5b5fee..407511f7f9b2d680606feaa5bf84102d045d8e90 100644 (file)
--- a/xml/dtd.c
+++ b/xml/dtd.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/xml/dtd.h b/xml/dtd.h
index 76402094798f0b66c40877674ce09cadd9a784bd..5249853f5dbb725532c3ceb060eac6133bde8167 100644 (file)
--- a/xml/dtd.h
+++ b/xml/dtd.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_XML_DTD_H
-#define _SHERLOCK_XML_DTD_H
+#ifndef _UCW_XML_DTD_H
+#define _UCW_XML_DTD_H
 
 #include <xml/xml.h>
 

diff --git a/xml/internals.h b/xml/internals.h
index 64a371539b84ce1765111871c471b4be88c2ec66..2a27126c0e954dc4835b018f400e6d09b636c8d8 100644 (file)
--- a/xml/internals.h
+++ b/xml/internals.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_XML_INTERNALS_H
-#define _SHERLOCK_XML_INTERNALS_H
+#ifndef _UCW_XML_INTERNALS_H
+#define _UCW_XML_INTERNALS_H
 
 #include <xml/xml.h>
 #include <xml/dtd.h>

diff --git a/xml/parse.c b/xml/parse.c
index a879effb136d04e4087f5088cf8caeee7b02309b..1187d8be231838767de40574109114f259b9a093 100644 (file)
--- a/xml/parse.c
+++ b/xml/parse.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/xml/source.c b/xml/source.c
index c3b30e6b234fcb935433748419be3d1dbce7b76d..8df409ff172931bdbddf61c933072e6d6fb66fa7 100644 (file)
--- a/xml/source.c
+++ b/xml/source.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/xml/xml-test.c b/xml/xml-test.c
index eb1577ff1be3228fc9d086ee8d3ffba9fe5e8626..6821c17fe37b168dd659e4277b9569f6ee65cab5 100644 (file)
--- a/xml/xml-test.c
+++ b/xml/xml-test.c
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *

diff --git a/xml/xml.h b/xml/xml.h
index 4340fb709c2ea206b93c995eba95bb33f89861e7..d8c797831d899f7c87a2c183ca0b8e8e47948f42 100644 (file)
--- a/xml/xml.h
+++ b/xml/xml.h
@@ -1,5 +1,5 @@
 /*
- *     Sherlock Library -- A simple XML parser
+ *     UCW Library -- A simple XML parser
  *
  *     (c) 2007--2008 Pavel Charvat <pchar@ucw.cz>
  *
@@ -7,8 +7,8 @@
  *     of the GNU Lesser General Public License.
  */
 
-#ifndef _SHERLOCK_XML_XML_H
-#define _SHERLOCK_XML_XML_H
+#ifndef _UCW_XML_XML_H
+#define _UCW_XML_XML_H
 
 #include <ucw/clists.h>
 #include <ucw/slists.h>