From 7c63d3c277723e5514079e89f56285ff305bc2d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Tue, 1 Nov 2022 23:44:38 +0100 Subject: [PATCH] Remove internal utf8 confusable functions from system.h The functions `str_utf8_skeleton_begin` and `str_utf8_skeleton_next` and the `struct SKELETON` are only used internally, so they don't need to be exported. --- src/base/system.h | 3 --- src/base/unicode/confusables.cpp | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/base/system.h b/src/base/system.h index 02a034c12..6895f012c 100644 --- a/src/base/system.h +++ b/src/base/system.h @@ -2048,9 +2048,6 @@ char str_uppercase(char c); int str_isallnum(const char *str); unsigned str_quickhash(const char *str); -struct SKELETON; -void str_utf8_skeleton_begin(struct SKELETON *skel, const char *str); -int str_utf8_skeleton_next(struct SKELETON *skel); int str_utf8_to_skeleton(const char *str, int *buf, int buf_len); /* diff --git a/src/base/unicode/confusables.cpp b/src/base/unicode/confusables.cpp index b957faeb0..d12aaa813 100644 --- a/src/base/unicode/confusables.cpp +++ b/src/base/unicode/confusables.cpp @@ -1,6 +1,6 @@ #include "confusables.h" -#include "../system.h" +#include #include @@ -35,14 +35,14 @@ struct SKELETON const char *str; }; -void str_utf8_skeleton_begin(struct SKELETON *skel, const char *str) +static void str_utf8_skeleton_begin(struct SKELETON *skel, const char *str) { skel->skeleton = NULL; skel->skeleton_len = 0; skel->str = str; } -int str_utf8_skeleton_next(struct SKELETON *skel) +static int str_utf8_skeleton_next(struct SKELETON *skel) { int ch = 0; while(skel->skeleton_len == 0)