Skip to content

Commit

Permalink
module: unicode: remove unused uconv.c
Browse files Browse the repository at this point in the history
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #16702
  • Loading branch information
nabijaczleweli authored Nov 1, 2024
1 parent db23545 commit 1c7d4b4
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 887 deletions.
22 changes: 0 additions & 22 deletions include/sys/u8_textprep.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,28 +36,6 @@
extern "C" {
#endif

/*
* Unicode encoding conversion functions and their macros.
*/
#define UCONV_IN_BIG_ENDIAN 0x0001
#define UCONV_OUT_BIG_ENDIAN 0x0002
#define UCONV_IN_SYSTEM_ENDIAN 0x0004
#define UCONV_OUT_SYSTEM_ENDIAN 0x0008
#define UCONV_IN_LITTLE_ENDIAN 0x0010
#define UCONV_OUT_LITTLE_ENDIAN 0x0020
#define UCONV_IGNORE_NULL 0x0040
#define UCONV_IN_ACCEPT_BOM 0x0080
#define UCONV_OUT_EMIT_BOM 0x0100

extern int uconv_u16tou32(const uint16_t *, size_t *, uint32_t *, size_t *,
int);
extern int uconv_u16tou8(const uint16_t *, size_t *, uchar_t *, size_t *, int);
extern int uconv_u32tou16(const uint32_t *, size_t *, uint16_t *, size_t *,
int);
extern int uconv_u32tou8(const uint32_t *, size_t *, uchar_t *, size_t *, int);
extern int uconv_u8tou16(const uchar_t *, size_t *, uint16_t *, size_t *, int);
extern int uconv_u8tou32(const uchar_t *, size_t *, uint32_t *, size_t *, int);

/*
* UTF-8 text preparation functions and their macros.
*
Expand Down
3 changes: 1 addition & 2 deletions lib/libunicode/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ libunicode_la_CFLAGS = $(AM_CFLAGS) $(KERNEL_CFLAGS) $(LIBRARY_CFLAGS)
noinst_LTLIBRARIES += libunicode.la

nodist_libunicode_la_SOURCES = \
module/unicode/u8_textprep.c \
module/unicode/uconv.c
module/unicode/u8_textprep.c
3 changes: 1 addition & 2 deletions module/Kbuild.in
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ zfs-objs += $(addprefix nvpair/,$(NVPAIR_OBJS))


UNICODE_OBJS := \
u8_textprep.o \
uconv.o
u8_textprep.o

zfs-objs += $(addprefix unicode/,$(UNICODE_OBJS))

Expand Down
3 changes: 1 addition & 2 deletions module/Makefile.bsd
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ SRCS+= abd_os.c \
zvol_os.c

#unicode
SRCS+= u8_textprep.c \
uconv.c
SRCS+= u8_textprep.c

#zcommon
SRCS+= cityhash.c \
Expand Down
Loading

0 comments on commit 1c7d4b4

Please sign in to comment.