From e2fdaebb74fa38acae3df58608f5409f264feb53 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sat, 11 Feb 2017 19:42:19 +0900 Subject: [PATCH] Rename eucsjis to utfsjis --- modules/SACT/sactcg.c | 2 +- modules/SACT/sactlog.c | 2 +- modules/SACT/sprite_msg.c | 2 +- src/Makefile.am | 2 +- src/Makefile.in | 6 +++--- src/ags.c | 2 +- src/cmd2F.c | 2 +- src/cmdm.c | 2 +- src/cmdn.c | 2 +- src/filecheck.c | 2 +- src/font_x11.c | 2 +- src/s39init.c | 2 +- src/savedata.c | 2 +- src/{eucsjis.c => utfsjis.c} | 4 ++-- src/{eucsjis.h => utfsjis.h} | 8 ++++---- 15 files changed, 21 insertions(+), 21 deletions(-) rename src/{eucsjis.c => utfsjis.c} (97%) rename src/{eucsjis.h => utfsjis.h} (92%) diff --git a/modules/SACT/sactcg.c b/modules/SACT/sactcg.c index d97247e..a734bbe 100644 --- a/modules/SACT/sactcg.c +++ b/modules/SACT/sactcg.c @@ -36,7 +36,7 @@ #include "sactcg.h" #include "surface.h" #include "ngraph.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "sactcg_stretch.c" #include "sactcg_blend.c" diff --git a/modules/SACT/sactlog.c b/modules/SACT/sactlog.c index 79c0cb2..149e954 100644 --- a/modules/SACT/sactlog.c +++ b/modules/SACT/sactlog.c @@ -39,7 +39,7 @@ #include "sprite.h" #include "ngraph.h" #include "drawtext.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "sactlog_sjismsg.c" /* diff --git a/modules/SACT/sprite_msg.c b/modules/SACT/sprite_msg.c index 4a585eb..f09ddd9 100644 --- a/modules/SACT/sprite_msg.c +++ b/modules/SACT/sprite_msg.c @@ -39,7 +39,7 @@ #include "ngraph.h" #include "drawtext.h" #include "sactlog.h" -#include "eucsjis.h" +#include "utfsjis.h" // メッセージキー待ちの時、表示するアニメーションに関する情報 struct markinfo { diff --git a/src/Makefile.am b/src/Makefile.am index 7ad4a89..53e2f02 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ @ESD_CFLAGS@ @S SRC_SYS35CMD = cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c SRC_CG = pms.c vsp.c bmp.c qnt.c SRC_MUS = music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c -SRC_MISC = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c +SRC_MISC = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c utfsjis.c filecheck.c tempname.c SRC_SCO = cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c SRC_GRAPH = ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c diff --git a/src/Makefile.in b/src/Makefile.in index caff89d..b4b82dc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -139,7 +139,7 @@ am__objects_5 = ags.$(OBJEXT) font.$(OBJEXT) flood.$(OBJEXT) \ alpha_plane.$(OBJEXT) cursor.$(OBJEXT) am__objects_6 = LittleEndian.$(OBJEXT) counter.$(OBJEXT) \ imput.$(OBJEXT) profile.$(OBJEXT) mt19937-1.$(OBJEXT) \ - @JOY_S@.$(OBJEXT) eucsjis.$(OBJEXT) filecheck.$(OBJEXT) \ + @JOY_S@.$(OBJEXT) utfsjis.$(OBJEXT) filecheck.$(OBJEXT) \ tempname.$(OBJEXT) am__objects_7 = network.$(OBJEXT) am__objects_8 = @@ -424,7 +424,7 @@ AM_CFLAGS = @DEBUG_CFLAGS@ @X_CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ @ESD_CFLAGS@ @S SRC_SYS35CMD = cmdb.c cmdc.c cmdd.c cmde.c cmdf.c cmdg.c cmdh.c cmdi.c cmdj.c cmdk.c cmdl.c cmdm.c cmdn.c cmdo.c cmdp.c cmdq.c cmds.c cmdt.c cmdu.c cmdv.c cmdw.c cmdy.c cmdz.c cmd2F.c cmd2F60.c SRC_CG = pms.c vsp.c bmp.c qnt.c SRC_MUS = music.c music_client.c music_server.c music_cdrom.c music_midi.c music_pcm.c music_fader.c wavfile.c wavmix.c audio.c midi.c cdrom.c sndcnv.c musstream.c pcmlib.c music_bgm.c musstream_wav.c musstream_ogg.c musstream_wav_ima.c -SRC_MISC = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c eucsjis.c filecheck.c tempname.c +SRC_MISC = LittleEndian.c counter.c imput.c profile.c mt19937-1.c @JOY_S@.c utfsjis.c filecheck.c tempname.c SRC_SCO = cali.c scenario.c variable.c cmd_check.c hankana2sjis.c nact.c selection.c message.c savedata.c hankaku.c s39ain.c s39init.c SRC_GRAPH = ags.c font.c flood.c cg.c ecopy.c antialiase.c alpha_plane.c cursor.c SRC_NET = network.c @@ -609,7 +609,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dri.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ecopy.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eucsjis.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filecheck.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flood.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/font.Po@am__quote@ @@ -644,6 +643,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/selection.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndcnv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utfsjis.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/variable.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vsp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wavfile.Po@am__quote@ diff --git a/src/ags.c b/src/ags.c index 240bcf4..614a133 100644 --- a/src/ags.c +++ b/src/ags.c @@ -35,7 +35,7 @@ #include "graphicsdevice.h" #include "alpha_plane.h" #include "counter.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "imput.h" #include "flood.h" #include "font.h" diff --git a/src/cmd2F.c b/src/cmd2F.c index e7375af..d828bd1 100644 --- a/src/cmd2F.c +++ b/src/cmd2F.c @@ -33,7 +33,7 @@ #include "selection.h" #include "message.h" #include "music_client.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "ags.h" #include "graphicsdevice.h" #include "ald_manager.h" diff --git a/src/cmdm.c b/src/cmdm.c index 4de0234..08799c5 100644 --- a/src/cmdm.c +++ b/src/cmdm.c @@ -27,7 +27,7 @@ #include "portab.h" #include "xsystem35.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "menu.h" #include "ags.h" #include "message.h" diff --git a/src/cmdn.c b/src/cmdn.c index c7fa1d0..e93caca 100644 --- a/src/cmdn.c +++ b/src/cmdn.c @@ -25,7 +25,7 @@ #include #include #include "portab.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "xsystem35.h" #include "menu.h" diff --git a/src/filecheck.c b/src/filecheck.c index 055678a..cecc5c1 100644 --- a/src/filecheck.c +++ b/src/filecheck.c @@ -27,7 +27,7 @@ #include #include -#include "eucsjis.h" +#include "utfsjis.h" struct fnametable { char *realname; diff --git a/src/font_x11.c b/src/font_x11.c index d1b933b..3d7720c 100644 --- a/src/font_x11.c +++ b/src/font_x11.c @@ -37,7 +37,7 @@ #include "ags.h" #include "xcore.h" #include "xcore_private.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "antialiase.h" /* fontset の為の情報 */ diff --git a/src/s39init.c b/src/s39init.c index 22e0ed4..ba61dc0 100644 --- a/src/s39init.c +++ b/src/s39init.c @@ -31,7 +31,7 @@ #include "system.h" #include "nact.h" #include "s39init.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "music_client.h" // Volume Valancer で扱う最大チャンネル数 diff --git a/src/savedata.c b/src/savedata.c index db53170..9f80d73 100644 --- a/src/savedata.c +++ b/src/savedata.c @@ -33,7 +33,7 @@ #include "scenario.h" #include "xsystem35.h" #include "LittleEndian.h" -#include "eucsjis.h" +#include "utfsjis.h" #include "filecheck.h" #include "windowframe.h" #include "selection.h" diff --git a/src/eucsjis.c b/src/utfsjis.c similarity index 97% rename from src/eucsjis.c rename to src/utfsjis.c index a72304f..370323e 100644 --- a/src/eucsjis.c +++ b/src/utfsjis.c @@ -1,5 +1,5 @@ /* - * eucsjis.c -- euc/sjis related function + * utfsjis.c -- utf-8/sjis related function * * Copyright (C) 1997 Yutaka OIWA * @@ -30,7 +30,7 @@ #include #include "portab.h" -#include "eucsjis.h" +#include "utfsjis.h" BYTE *sjis2utf(BYTE *src) { gchar *gbuf = g_convert_with_fallback(src, -1, "utf-8", "shift-jis", NULL, NULL, NULL, NULL); diff --git a/src/eucsjis.h b/src/utfsjis.h similarity index 92% rename from src/eucsjis.h rename to src/utfsjis.h index 0dd5ff2..1f0e179 100644 --- a/src/eucsjis.h +++ b/src/utfsjis.h @@ -1,5 +1,5 @@ /* - * eucsjis.h -- euc/sjis related function + * utfsjis.h -- utf-8/sjis related function * * Copyright (C) 1997-1998 Masaki Chikama (Wren) * 1998- @@ -21,8 +21,8 @@ */ /* $Id: eucsjis.h,v 1.2 2000/09/20 10:33:16 chikama Exp $ */ -#ifndef __EUCSJIS__ -#define __EUCSJIS__ +#ifndef __UTFSJIS__ +#define __UTFSJIS__ #include "portab.h" @@ -40,4 +40,4 @@ extern int sjis_count_char(BYTE *src); extern void sjis_toupper(BYTE *src); extern BYTE* sjis_toupper2(BYTE *src); -#endif /* __EUCSJIS__ */ +#endif /* __UTFSJIS__ */