From 9eced34900ffd36b784e3a4a5bda7ec75d7f9fae Mon Sep 17 00:00:00 2001
From: Masanori Ogino <mogino@acm.org>
Date: Thu, 30 Nov 2023 14:51:05 +0900
Subject: [PATCH] sj3lib: Make string APIs public

Signed-off-by: Masanori Ogino <mogino@acm.org>
---
 sj3lib/level1.c    |  1 +
 sj3lib/sj.c        |  4 ++--
 sj3lib/sj3lib.h    | 22 ++++++++++++++++++++++
 sj3lib/sj_string.h | 47 ----------------------------------------------
 sj3lib/string.c    |  2 +-
 5 files changed, 26 insertions(+), 50 deletions(-)
 delete mode 100644 sj3lib/sj_string.h

diff --git a/sj3lib/level1.c b/sj3lib/level1.c
index f0df77f..2c222df 100644
--- a/sj3lib/level1.c
+++ b/sj3lib/level1.c
@@ -44,6 +44,7 @@
 #include "Const.h"
 #include "sj3cmd.h"
 #include "sj3err.h"
+
 #include "sj3lib.h"
 
 int	 sj3_error_number;
diff --git a/sj3lib/sj.c b/sj3lib/sj.c
index b759fed..845f5a4 100644
--- a/sj3lib/sj.c
+++ b/sj3lib/sj.c
@@ -42,10 +42,10 @@
 
 #include "Const.h"
 #include "sj3err.h"
-#include "sj3lib.h"
 #include "sj_const.h"
 #include "sj_hinsi.h"
-#include "sj_string.h"
+
+#include "sj3lib.h"
 
 extern int	sj3_error_number;
 
diff --git a/sj3lib/sj3lib.h b/sj3lib/sj3lib.h
index b5356cb..72385ed 100644
--- a/sj3lib/sj3lib.h
+++ b/sj3lib/sj3lib.h
@@ -232,4 +232,26 @@ int sj3_prevdict_mb(u_char *buf);
 int sj3_lockserv(void);
 int sj3_unlockserv(void);
 
+/* string.c */
+int sj3_str_sjistoeuc(unsigned char *, int, unsigned char *, unsigned char *,
+    int *);
+int sj3_str_euctosjis(unsigned char *, int, unsigned char *, unsigned char *,
+    int *);
+
+int sj3_sjistoeuclen(unsigned char *, int);
+
+int sj3_sjistoeuc(unsigned char *, int, unsigned char *, int);
+int sj3_euctosjis(unsigned char *, int, unsigned char *, int);
+
+void sj_euc2sjis(unsigned char *);
+void sj_jis2sjis(unsigned char *);
+void sj_sjis2euc(unsigned char *);
+void sj_sjis2jis(unsigned char *);
+
+unsigned short sj3_jis2sjis(unsigned short);
+unsigned short sj3_jis2euc(unsigned short);
+unsigned short sj3_sjis2jis(unsigned short);
+unsigned short sj3_euc2sjis(unsigned short);
+unsigned short sj3_sjis2euc(unsigned short);
+
 #endif /* _SJ3LIB_H_ */
diff --git a/sj3lib/sj_string.h b/sj3lib/sj_string.h
deleted file mode 100644
index 0f07192..0000000
--- a/sj3lib/sj_string.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * SPDX-License-Identifier: MIT
- *
- * Copyright (c) 2023  Masanori Ogino
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, 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 IN THE
- * SOFTWARE.
- */
-
-#ifndef SJ3_SJ_STRING_H_
-#define SJ3_SJ_STRING_H_
-
-int sj3_str_sjistoeuc(unsigned char *, int, unsigned char *, unsigned char *, int *);
-int sj3_str_euctosjis(unsigned char *, int, unsigned char *, unsigned char *, int *);
-
-int sj3_sjistoeuclen(unsigned char *, int);
-
-int sj3_sjistoeuc(unsigned char *, int, unsigned char *, int);
-int sj3_euctosjis(unsigned char *, int, unsigned char *, int);
-
-void sj_euc2sjis (unsigned char *);
-void sj_jis2sjis (unsigned char *);
-void sj_sjis2euc (unsigned char *);
-void sj_sjis2jis (unsigned char *);
-
-unsigned short sj3_jis2sjis(unsigned short);
-unsigned short sj3_jis2euc(unsigned short);
-unsigned short sj3_sjis2jis(unsigned short);
-unsigned short sj3_euc2sjis(unsigned short);
-unsigned short sj3_sjis2euc(unsigned short);
-
-#endif
diff --git a/sj3lib/string.c b/sj3lib/string.c
index 340db72..29974cb 100644
--- a/sj3lib/string.c
+++ b/sj3lib/string.c
@@ -35,7 +35,7 @@
 
 #include "sj_euc.h"
 
-#include "sj_string.h"
+#include "sj3lib.h"
 
 #ifndef TRUE
 #define TRUE (1)