nishiTV/sj3
1
0
Fork 0
Code Pull requests Activity

sj3lib: Remove NEWS-specific code

Browse source 
Signed-off-by: Masanori Ogino <mogino@acm.org>
This commit is contained in:
Masanori Ogino 2023-11-30 05:39:23 +09:00
commit 8e85895522
2 changed files with 0 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

26
sj3lib/sj.c
View file

@ -47,14 +47,10 @@
#include "sj_hinsi.h" #include "sj_hinsi.h"
extern int sj3_error_number; extern int sj3_error_number;
#ifdef __sony_news
extern int _sys_code;
#else
#define SYS_SJIS 0 #define SYS_SJIS 0
#define SYS_EUC 1 #define SYS_EUC 1
#define SYS_NOTDEF -1 #define SYS_NOTDEF -1
static int _sys_code = SYS_NOTDEF; static int _sys_code = SYS_NOTDEF;
#endif /* __sony_news */
char *sj3_user_dir = "user"; char *sj3_user_dir = "user";
static char *path_delimiter = "/"; static char *path_delimiter = "/";
@ -69,8 +65,6 @@ static u_char buf1[YomiBufSize];
static u_char buf2[YomiBufSize]; static u_char buf2[YomiBufSize];
static u_char kbuf[KanjiBufSize]; static u_char kbuf[KanjiBufSize];
#ifndef __sony_news
static int static int
set_sys_code(void) set_sys_code(void)
{ {
@ -82,8 +76,6 @@ set_sys_code(void)
return SYS_EUC; return SYS_EUC;
} }
#endif
static int static int
make_dirs(char* path) make_dirs(char* path)
@ -509,10 +501,8 @@ sj3_getkan_euc(u_char* yomi, SJ3_BUNSETU* bun, u_char* knj, int knjsiz)
int int
sj3_getkan_mb(u_char* yomi, SJ3_BUNSETU* bun, u_char* knj, int knjsiz) sj3_getkan_mb(u_char* yomi, SJ3_BUNSETU* bun, u_char* knj, int knjsiz)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_getkan_euc(yomi, bun, knj, knjsiz); return sj3_getkan_euc(yomi, bun, knj, knjsiz);
else else
@ -576,10 +566,8 @@ sj3_douoncnt_euc(u_char* yomi)
int int
sj3_douoncnt_mb(u_char* yomi) sj3_douoncnt_mb(u_char* yomi)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_douoncnt_euc(yomi); return sj3_douoncnt_euc(yomi);
else else
@ -651,10 +639,8 @@ sj3_getdouon_euc(u_char* yomi, SJ3_DOUON* dou)
int int
sj3_getdouon_mb(u_char* yomi, SJ3_DOUON* dou) sj3_getdouon_mb(u_char* yomi, SJ3_DOUON* dou)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_getdouon_euc(yomi, dou); return sj3_getdouon_euc(yomi, dou);
else else
@ -725,10 +711,8 @@ sj3_gakusyuu2_euc(u_char* yomi1, u_char* yomi2, SJ3_STUDYREC* dcid)
int int
sj3_gakusyuu2_mb(u_char* yomi1, u_char* yomi2, SJ3_STUDYREC* dcid) sj3_gakusyuu2_mb(u_char* yomi1, u_char* yomi2, SJ3_STUDYREC* dcid)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_gakusyuu2_euc(yomi1, yomi2, dcid); return sj3_gakusyuu2_euc(yomi1, yomi2, dcid);
else else
@ -811,10 +795,8 @@ sj3_touroku_euc(u_char* yomi, u_char* kanji, int code)
int int
sj3_touroku_mb(u_char* yomi, u_char* kanji, int code) sj3_touroku_mb(u_char* yomi, u_char* kanji, int code)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_touroku_euc(yomi, kanji, code); return sj3_touroku_euc(yomi, kanji, code);
else else
@ -889,10 +871,8 @@ sj3_syoukyo_euc(u_char* yomi, u_char* kanji, int code)
int int
sj3_syoukyo_mb(u_char* yomi, u_char* kanji, int code) sj3_syoukyo_mb(u_char* yomi, u_char* kanji, int code)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_syoukyo_euc(yomi, kanji, code); return sj3_syoukyo_euc(yomi, kanji, code);
else else
@ -957,10 +937,8 @@ sj3_getdict_euc(u_char* buf)
int int
sj3_getdict_mb(u_char* buf) sj3_getdict_mb(u_char* buf)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_getdict_euc(buf); return sj3_getdict_euc(buf);
else else
@ -1024,10 +1002,8 @@ sj3_nextdict_euc(u_char* buf)
int int
sj3_nextdict_mb(u_char* buf) sj3_nextdict_mb(u_char* buf)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_nextdict_euc(buf); return sj3_nextdict_euc(buf);
else else
@ -1091,10 +1067,8 @@ sj3_prevdict_euc(u_char* buf)
int int
sj3_prevdict_mb(u_char* buf) sj3_prevdict_mb(u_char* buf)
{ {
#ifndef __sony_news
if (_sys_code == SYS_NOTDEF) if (_sys_code == SYS_NOTDEF)
_sys_code = set_sys_code(); _sys_code = set_sys_code();
#endif
if (_sys_code == SYS_EUC) if (_sys_code == SYS_EUC)
return sj3_prevdict_euc(buf); return sj3_prevdict_euc(buf);
else else

28
sj3lib/string.c
View file

@ -40,7 +40,6 @@
#define FALSE (0) #define FALSE (0)
#endif #endif
#ifndef __sony_news
#define sjis2euc sj3_sjis2euc #define sjis2euc sj3_sjis2euc
#define euc2sjis sj3_euc2sjis #define euc2sjis sj3_euc2sjis
@ -50,7 +49,6 @@
#define iskana(c) ((0xa1 <= (c)) && ((c) <= 0xdf)) #define iskana(c) ((0xa1 <= (c)) && ((c) <= 0xdf))
unsigned short sjis2euc(), euc2sjis(); unsigned short sjis2euc(), euc2sjis();
#endif
void sj_sjis2jis(), sj_jis2sjis(); void sj_sjis2jis(), sj_jis2sjis();
@ -175,7 +173,6 @@ int max;
#define MASK 0x7f #define MASK 0x7f
#define MSB 0x80 #define MSB 0x80
#if !defined(__sony_news) || defined(__sony_news)
static unsigned char def_char[] = {0x81, 0x40}; static unsigned char def_char[] = {0x81, 0x40};
int int
@ -349,28 +346,3 @@ unsigned short code;
return(code); return(code);
} }
#else
static unsigned char def_char[] = {0x81, 0x40};
int
sj3_sjistoeuc(e, elen, s, slen)
unsigned char *s, *e;
int slen, elen;
{
int dummy;
return sj3_str_sjistoeuc(e, elen, s, def_char, &dummy);
}
int
sj3_euctosjis(s, slen, e, elen)
unsigned char *s, *e;
int slen, elen;
{
int dummy;
return sj3_str_euctosjis(s, slen, e, def_char, &dummy);
}
#endif