libutil

C Utility Library
git clone http://git.omkov.net/libutil
Log | Tree | Refs | README | LICENCE | Download

AuthorJamozed <[email protected]>
Date2021-11-27 04:53:46
Commit98e59396782378640b62f7f3575a2b26a934ca9e
Parent12c01d4fee3fe8de2517207d3d022e79e4d38e54

meta: Rename libcll to libutil

Diffstat

M CMakeLists.txt | 7 ++++---
M README.md | 13 ++++++++-----
M man/error.3 | 27 ++++++++++++++++-----------
M man/optget.3 | 2 ++
M src/base32.c | 4 ++--
M src/base32.h | 10 +++++-----
M src/base64.c | 4 ++--
M src/base64.h | 10 +++++-----
M src/crypt.h | 10 +++++-----
M src/endian.h | 9 ++++++---
M src/error.c | 4 ++--
M src/error.h | 10 +++++-----
M src/fnv.c | 2 ++
M src/fnv.h | 9 +++++----
M src/mode.c | 4 ++--
M src/mode.h | 10 +++++-----
M src/optget.c | 3 ++-
M src/optget.h | 10 +++++-----
M src/rc2.c | 3 ++-
M src/rc2.h | 10 +++++-----
M src/strconv.h | 6 +++++-
M src/strtoi.c | 4 ++--
M src/strtou.c | 3 ++-
M src/test/test_base32.c | 2 +-
M src/test/test_base64.c | 2 +-
M src/test/test_crypt.c | 2 +-
M src/test/test_endian.c | 2 +-
M src/test/test_error.c | 1 +
M src/test/test_fnv.c | 1 +
M src/test/test_optget.c | 2 +-
M src/test/test_rc2.c | 1 +
M src/test/test_strtou.c | 2 +-

32 files changed, 108 insertions, 81 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7791bbc..039feb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.12)
-PROJECT(libcll LANGUAGES C)
+PROJECT(libutil LANGUAGES C)
 
 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
@@ -9,10 +9,10 @@ SET(CMAKE_SHARED_LIBRARY_PREFIX "")
 
 FILE(GLOB SRC ${PROJECT_SOURCE_DIR}/src/*)
 
-ADD_LIBRARY(libcll_static STATIC ${SRC})
-ADD_LIBRARY(libcll_shared SHARED ${SRC})
+ADD_LIBRARY(libutil_static STATIC ${SRC})
+ADD_LIBRARY(libutil_shared SHARED ${SRC})
 
-LINK_LIBRARIES(libcll_static)
+LINK_LIBRARIES(libutil_static)
 
 ADD_EXECUTABLE(test_base32 ${PROJECT_SOURCE_DIR}/src/test/test_base32.c)
 ADD_EXECUTABLE(test_base64 ${PROJECT_SOURCE_DIR}/src/test/test_base64.c)
diff --git a/README.md b/README.md
index 97b6946..eaa56a9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
-# libcll
+# libutil
 
-> C local library
+> C Utility Library
 
-**libcll** is a lightweight library to be included locally in projects.
+**libutil** is a lightweight library to be included locally in projects that is
+intended to provide common portable extensions to the C standard library.
 
 ## Components
 
@@ -21,10 +22,10 @@
 
 ## Usage
 
-**libcll** is being developed on x86-64 Linux, and some components may depend on
-POSIX provided functionality.
+**libutil** is being developed on x86-64 Linux, and some components may depend
+on POSIX provided functionality.
 
-**libcll** source files are intended to be built directly into your project.
+**libutil** source files are intended to be built directly into your project.
 
 ### Dependencies
 
@@ -32,7 +33,7 @@ POSIX provided functionality.
 
 ### Building
 
-> To build **libcll** on UNIX, run `BuildUNIX.sh` or
+> To build **libutil** and its unit tests on UNIX, run `BuildUNIX.sh` or
 
 ```sh
 cmake -S . -B build && cmake --build build
@@ -43,7 +44,7 @@ Libraries will be located in the `lib` directory.
 
 ### Testing
 
-> To run **libcll** unit tests on UNIX, run TestUNIX.sh once built
+> To run **libutil** unit tests on UNIX, run TestUNIX.sh once built
 
 ## Meta
 
diff --git a/man/error.3 b/man/error.3
index 606841f..f628336 100644
--- a/man/error.3
+++ b/man/error.3
@@ -1,26 +1,29 @@
-.TH ERROR 3 2020-11-01 "libcll" "libcll Programmer's Manual"
+.TH ERROR 3 2021-11-27 "libutil" "libutil Programmer's Manual"
 .SH NAME
-error, warn, serr \(em error reporting functions
+error, warn, alert \(em error reporting functions
 .SH SYNOPSYS
-#include <error.h>
+#include "error.h"
 .PP
 extern char *\fIA0\fR;
+.br
+extern bool \fIwarned\fR;
 .PP
 void \fBerror\fR(int \fIstatus\fR, const char *\fIformat\fR, ...);
 .br
 void \fBwarn\fR(const char *\fIformat\fR, ...);
 .br
-char *\fBserr\fR(void);
+void \fBalert\fR(const char *\fIformat\fR, ...);
 .SH DESCRIPTION
-The \fBerror\fR() and \fBwarn\fR() functions print a formatted error message to
-standard error. If the global variable \fIA0\fR is set, it is output, followed
-by a colon character and a space, in front of the formatted error message.
+The \fBerror\fR(), \fBwarn\fR(), and \fBalert\fR functions print a formatted
+error message to stderr. If the global variable \fIA0\fR is set, it is output,
+followed by a colon character and a space, in front of the formatted error
+message.
 .PP
-The \fBerror\fR() function will call the \fBexit\fR() function specified
-declared in <stdlib.h> with \fIstatus\fR as its argument after the error message
-has been printed.
+The \fBerror\fR() function will call the \fBexit\fR() function declared in
+<stdlib.h> with \fIstatus\fR as its argument after the error message has been
+printed.
 .PP
-The \fBserr\fR() function is shorthand for \fBstrerror\fR(\fIerrno\fR).
+The \fBwarn\fR() function will set the global variable \fIwarned\fR to true.
 .SH COPYRIGHT
 .nf
 Copyright (C) 2020, Jakob Wakeling
diff --git a/man/optget.3 b/man/optget.3
index ee3332a..6e22896 100644
--- a/man/optget.3
+++ b/man/optget.3
@@ -1,8 +1,8 @@
-.TH OPTGET 3 2020-11-01 "libcll" "libcll Programmer's Manual"
+.TH OPTGET 3 2021-11-27 "libutil" "libutil Programmer's Manual"
 .SH NAME
 optget \(em parse command line options
 .SH SYNOPSYS
-#include <optget.h>
+#include "optget.h"
 .PP
 extern const struct opt \fIOPTGET_INIT\fR;
 .PP
diff --git a/src/base32.c b/src/base32.c
index a339be4..09af30c 100644
--- a/src/base32.c
+++ b/src/base32.c
@@ -1,5 +1,5 @@
-// base32.c, version 1.0.2
-// Base32 source file for libcll
+// util/base32.c, version 1.0.3
+// Base32 source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/base32.h b/src/base32.h
index 7d445bf..98fc671 100644
--- a/src/base32.h
+++ b/src/base32.h
@@ -1,5 +1,5 @@
-// base32.h, version 1.0.2
-// Base32 header file for libcll
+// util/base32.h, version 1.0.3
+// Base32 header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_BASE32_H_2PSMZTB0
-#define OMKOV_LIBCLL_BASE32_H_2PSMZTB0
+#ifndef UTIL_BASE32_H_2PSMZTB0
+#define UTIL_BASE32_H_2PSMZTB0
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -42,4 +42,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 extern size_t b32encode(uint8_t *dst, uint8_t *src, size_t len);
 extern size_t b32decode(uint8_t *dst, uint8_t *src, size_t len);
 
-#endif // OMKOV_LIBCLL_BASE32_H_2PSMZTB0
+#endif // UTIL_BASE32_H_2PSMZTB0
diff --git a/src/base64.c b/src/base64.c
index 90025f3..91c774e 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,5 @@
-// base64.c, version 1.1.3
-// Base64 source file for libcll
+// util/base64.c, version 1.1.4
+// Base64 source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/base64.h b/src/base64.h
index bd3ab87..f606ffe 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -1,5 +1,5 @@
-// base64.h, version 1.1.3
-// Base64 header file for libcll
+// util/base64.h, version 1.1.4
+// Base64 header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_BASE64_H_5YQ80JRV
-#define OMKOV_LIBCLL_BASE64_H_5YQ80JRV
+#ifndef UTIL_BASE64_H_5YQ80JRV
+#define UTIL_BASE64_H_5YQ80JRV
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -42,4 +42,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 extern size_t b64encode(uint8_t *dst, uint8_t *src, size_t len);
 extern size_t b64decode(uint8_t *dst, uint8_t *src, size_t len);
 
-#endif // OMKOV_LIBCLL_BASE64_H_5YQ80JRV
+#endif // UTIL_BASE64_H_5YQ80JRV
diff --git a/src/crypt.h b/src/crypt.h
index 3d6e96a..29a2cff 100644
--- a/src/crypt.h
+++ b/src/crypt.h
@@ -1,5 +1,5 @@
-// crypt.h, version 0.1.0
-// Crypt header file for libcll
+// util/crypt.h, version 0.1.1
+// Crypt header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_CRYPT_H_RDY6J5JV
-#define OMKOV_LIBCLL_CRYPT_H_RDY6J5JV
+#ifndef UTIL_CRYPT_H_RDY6J5JV
+#define UTIL_CRYPT_H_RDY6J5JV
 
 #include <stdint.h>
 
@@ -47,4 +47,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 #define ROR32(x, n) (uint32_t)(((x) >> (n)) | ((x) << (32 - (n))))
 #define ROR64(x, n) (uint64_t)(((x) >> (n)) | ((x) << (64 - (n))))
 
-#endif // OMKOV_LIBCLL_CRYPT_H_RDY6J5JV
+#endif // UTIL_CRYPT_H_RDY6J5JV
diff --git a/src/endian.h b/src/endian.h
index 3097498..96b90b3 100644
--- a/src/endian.h
+++ b/src/endian.h
@@ -1,5 +1,5 @@
-// endian.h, version 1.0.0
-// Endian header file for libcll
+// util/endian.h, version 1.0.1
+// Endian header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_ENDIAN_H_G7AID2RQ
-#define OMKOV_LIBCLL_ENDIAN_H_G7AID2RQ
+#ifndef UTIL_ENDIAN_H_G7AID2RQ
+#define UTIL_ENDIAN_H_G7AID2RQ
 
 #include <stdint.h>
 
@@ -150,4 +150,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 	((uint8_t *)(p))[6] = ((uint64_t)(x) >>  8) & 0xFFu; \
 	((uint8_t *)(p))[7] = ((uint64_t)(x) >>  0) & 0xFFu
 
-#endif // OMKOV_LIBCLL_ENDIAN_H_G7AID2RQ
+#endif // UTIL_ENDIAN_H_G7AID2RQ
diff --git a/src/error.c b/src/error.c
index 4af4ae5..698253d 100644
--- a/src/error.c
+++ b/src/error.c
@@ -1,5 +1,5 @@
-// error.c, version 1.0.2
-// Error source file for libcll
+// util/error.c, version 1.0.3
+// Error source file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/error.h b/src/error.h
index 0d95d25..73648ac 100644
--- a/src/error.h
+++ b/src/error.h
@@ -1,5 +1,5 @@
-// error.h, version 1.0.2
-// Error header file for libcll
+// util/error.h, version 1.0.3
+// Error header file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_ERROR_H_38W06M3W
-#define OMKOV_LIBCLL_ERROR_H_38W06M3W
+#ifndef UTIL_ERROR_H_38W06M3W
+#define UTIL_ERROR_H_38W06M3W
 
 #include <stdbool.h>
 #include <stdnoreturn.h>
@@ -44,4 +44,4 @@ extern void warn(const char *format, ...);
 
 extern char *serr(void);
 
-#endif // OMKOV_LIBCLL_ERROR_H_38W06M3W
+#endif // UTIL_ERROR_H_38W06M3W
diff --git a/src/fnv.c b/src/fnv.c
index d83c1d6..d675213 100644
--- a/src/fnv.c
+++ b/src/fnv.c
@@ -1,5 +1,5 @@
-// fnv.c
-// FNV hash source file for libcll
+// util/fnv.c, version 1.0.0
+// FNV hash source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/fnv.h b/src/fnv.h
index ae56e60..f453f5f 100644
--- a/src/fnv.h
+++ b/src/fnv.h
@@ -1,5 +1,5 @@
-// fnv.h
-// FNV hash header file for libcll
+// util/fnv.h, version 1.0.0
+// FNV hash header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_FNV_H_O4TYU6Q1
-#define OMKOV_LIBCLL_FNV_H_O4TYU6Q1
+#ifndef UTIL_FNV_H_O4TYU6Q1
+#define UTIL_FNV_H_O4TYU6Q1
 
 #include <stddef.h>
 #include <stdint.h>
@@ -45,4 +45,4 @@ extern void fnv1a32_hash(uint32_t *ctx, uint8_t *dat, size_t len);
 extern void fnv1a64_init(uint64_t *ctx);
 extern void fnv1a64_hash(uint64_t *ctx, uint8_t *dat, size_t len);
 
-#endif // OMKOV_LIBCLL_FNV_H_O4TYU6Q1
+#endif // UTIL_FNV_H_O4TYU6Q1
diff --git a/src/mode.c b/src/mode.c
index 424a8df..3d235ba 100644
--- a/src/mode.c
+++ b/src/mode.c
@@ -1,5 +1,5 @@
-// mode.c, version 1.0.1
-// Mode source file for libcll
+// util/mode.c, version 1.0.2
+// Mode source file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/mode.h b/src/mode.h
index d8d9f75..09c7dc0 100644
--- a/src/mode.h
+++ b/src/mode.h
@@ -1,5 +1,5 @@
-// mode.h, version 1.0.1
-// Mode header file for libcll
+// util/mode.h, version 1.0.2
+// Mode header file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_MODE_H_0C99POMA
-#define OMKOV_LIBCLL_MODE_H_0C99POMA
+#ifndef UTIL_MODE_H_0C99POMA
+#define UTIL_MODE_H_0C99POMA
 
 #include <sys/types.h>
 
@@ -51,4 +51,4 @@ enum { MF_NULL, MF_NORM, MF_XIFX, MF_COPY };
 
 extern chmod_t *strmode(char *str);
 
-#endif // OMKOV_LIBCLL_MODE_H_0C99POMA
+#endif // UTIL_MODE_H_0C99POMA
diff --git a/src/optget.c b/src/optget.c
index a466580..24d334d 100644
--- a/src/optget.c
+++ b/src/optget.c
@@ -1,5 +1,5 @@
-// optget.h, version 1.6.0
-// optget source file for libcll
+// util/optget.h, version 1.6.1
+// optget source file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/optget.h b/src/optget.h
index 4f7716a..e3065fb 100644
--- a/src/optget.h
+++ b/src/optget.h
@@ -1,5 +1,5 @@
-// optget.h, version 1.6.0
-// optget header file for libcll
+// util/optget.h, version 1.6.1
+// optget header file from libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_OPTGET_H_W3LIZK1S
-#define OMKOV_LIBCLL_OPTGET_H_W3LIZK1S
+#ifndef UTIL_OPTGET_H_W3LIZK1S
+#define UTIL_OPTGET_H_W3LIZK1S
 
 #define ARG_NUL 0
 #define ARG_REQ 1
@@ -52,4 +52,4 @@ extern const struct opt OPTGET_INIT;
 
 extern int optget(struct opt *opt, char *av[], int flags);
 
-#endif // OMKOV_LIBCLL_OPTGET_H_W3LIZK1S
+#endif // UTIL_OPTGET_H_W3LIZK1S
diff --git a/src/rc2.c b/src/rc2.c
index e43bc8b..104b8c9 100644
--- a/src/rc2.c
+++ b/src/rc2.c
@@ -1,5 +1,5 @@
-// rc2.c
-// RC2 source file for libcll
+// util/rc2.c, version 1.0.0
+// RC2 source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/rc2.h b/src/rc2.h
index e729ac7..ee6ef1e 100644
--- a/src/rc2.h
+++ b/src/rc2.h
@@ -1,5 +1,5 @@
-// rc2.h
-// RC2 header file for libcll
+// util/rc2.h, version 1.0.0
+// RC2 header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_RC2_H_PMXL29JH
-#define OMKOV_LIBCLL_RC2_H_PMXL29JH
+#ifndef UTIL_RC2_H_PMXL29JH
+#define UTIL_RC2_H_PMXL29JH
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -42,4 +42,4 @@ extern void rc2expand(struct rc2 *ctx, const uint8_t *key, int len, int ekl);
 extern void rc2encrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out);
 extern void rc2decrypt(struct rc2 *ctx, uint8_t *in, uint8_t *out);
 
-#endif // OMKOV_LIBCLL_RC2_H_PMXL29JH
+#endif // UTIL_RC2_H_PMXL29JH
diff --git a/src/strconv.h b/src/strconv.h
index a6a0b2b..655ef06 100644
--- a/src/strconv.h
+++ b/src/strconv.h
@@ -1,5 +1,5 @@
-// strconv.h, version 1.1.0
-// String conversion header file for libcll
+// util/strconv.h, version 1.1.1
+// String conversion header file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
@@ -30,8 +30,8 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
 */
 
-#ifndef OMKOV_LIBCLL_STRCONV_H_3EQMSZZK
-#define OMKOV_LIBCLL_STRCONV_H_3EQMSZZK
+#ifndef UTIL_STRCONV_H_3EQMSZZK
+#define UTIL_STRCONV_H_3EQMSZZK
 
 #include <stdint.h>
 
@@ -45,4 +45,4 @@ uint16_t strtou16(const char *nptr, char **endptr, register int base);
 uint32_t strtou32(const char *nptr, char **endptr, register int base);
 uint64_t strtou64(const char *nptr, char **endptr, register int base);
 
-#endif // OMKOV_LIBCLL_STRCONV_H_3EQMSZZK
+#endif // UTIL_STRCONV_H_3EQMSZZK
diff --git a/src/strtoi.c b/src/strtoi.c
index 3cd3ef3..b3d94dc 100644
--- a/src/strtoi.c
+++ b/src/strtoi.c
@@ -1,5 +1,5 @@
-// strtoi.c, version 1.1.0
-// String conversion source file for libcll
+// util/strtoi.c, version 1.1.1
+// String conversion source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/strtou.c b/src/strtou.c
index ef52d2f..7e9acf0 100644
--- a/src/strtou.c
+++ b/src/strtou.c
@@ -1,5 +1,5 @@
-// strtou.c, version 1.1.0
-// String conversion source file for libcll
+// util/strtou.c, version 1.1.1
+// String conversion source file from libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_base32.c b/src/test/test_base32.c
index b6991ad..f435460 100644
--- a/src/test/test_base32.c
+++ b/src/test/test_base32.c
@@ -1,5 +1,5 @@
 // test_base32.c
-// Base32 unit test for libcll
+// Base32 unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_base64.c b/src/test/test_base64.c
index 731e8e5..bf4435a 100644
--- a/src/test/test_base64.c
+++ b/src/test/test_base64.c
@@ -1,5 +1,5 @@
 // test_base64.c
-// Base64 unit test for libcll
+// Base64 unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_crypt.c b/src/test/test_crypt.c
index b0d3e47..3fdb634 100644
--- a/src/test/test_crypt.c
+++ b/src/test/test_crypt.c
@@ -1,5 +1,5 @@
 // test_crypt.c
-// Crypt unit test for libcll
+// Crypt unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_endian.c b/src/test/test_endian.c
index c831e04..cb2f50f 100644
--- a/src/test/test_endian.c
+++ b/src/test/test_endian.c
@@ -1,5 +1,5 @@
 // test_endian.c
-// Endian unit test for libcll
+// Endian unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_error.c b/src/test/test_error.c
index 193f09e..0ceccec 100644
--- a/src/test/test_error.c
+++ b/src/test/test_error.c
@@ -1,5 +1,5 @@
 // test_error.c
-// Error unit test for libcll
+// Error unit test for libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_fnv.c b/src/test/test_fnv.c
index d68dcc1..0c0c301 100644
--- a/src/test/test_fnv.c
+++ b/src/test/test_fnv.c
@@ -1,5 +1,5 @@
 // test_fnv.c
-// FNV unit test for libcll
+// FNV unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_optget.c b/src/test/test_optget.c
index ee287b7..fd619d8 100644
--- a/src/test/test_optget.c
+++ b/src/test/test_optget.c
@@ -1,5 +1,5 @@
 // test_optget.c
-// optget unit test for libcll
+// optget unit test for libutil
 // Copyright (C) 2020, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_rc2.c b/src/test/test_rc2.c
index e7c8e9a..a53bb09 100644
--- a/src/test/test_rc2.c
+++ b/src/test/test_rc2.c
@@ -1,5 +1,5 @@
 // test_crypt.c
-// Crypt unit test for libcll
+// Crypt unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.
 
diff --git a/src/test/test_strtou.c b/src/test/test_strtou.c
index 2f7f05e..9fb4e6f 100644
--- a/src/test/test_strtou.c
+++ b/src/test/test_strtou.c
@@ -1,5 +1,5 @@
 // test_strtou.c
-// String conversion unit test for libcll
+// String conversion unit test for libutil
 // Copyright (C) 2021, Jakob Wakeling
 // All rights reserved.