From 664b6b3ef37aa0ba3b20bb3a1f5a811d1a125ebf Mon Sep 17 00:00:00 2001 From: kobake Date: Thu, 26 Jul 2018 10:54:48 +0900 Subject: [PATCH] =?UTF-8?q?btool=20=E9=85=8D=E4=B8=8B=E3=81=AE=E3=82=BD?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=82=B3=E3=83=BC=E3=83=89=E3=82=92=20UTF-8?= =?UTF-8?q?=20(BOM=E4=BB=98=E3=81=8D)=20=E3=81=AB=E5=A4=89=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit cd btool nkf --overwrite --oc=UTF-8-BOM *.cpp nkf --overwrite --oc=UTF-8-BOM *.h --- btool/RcCvt.cpp | 14 +++++++------- btool/RcCvt.h | 14 +++++++------- btool/mrc2brc.cpp | 2 +- btool/mrc2grc.cpp | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/btool/RcCvt.cpp b/btool/RcCvt.cpp index 0aa2271ae1..5c712d026d 100644 --- a/btool/RcCvt.cpp +++ b/btool/RcCvt.cpp @@ -1,4 +1,4 @@ -//// +//// // RcCvt : convert MSVC type resource file to Brc32 type. // 20010820 aroka @@ -37,10 +37,10 @@ bool RcCvt::setErr(char*errstr) char *t; int lcr = strlen(errstr)+2; if( strerr ){ - t = (char*)realloc( strerr , strlen(strerr)+lcr ); // 2003.10.31 moca •s—v‚È+1‚ðíœ + t = (char*)realloc( strerr , strlen(strerr)+lcr ); // 2003.10.31 moca ä¸è¦ãª+1を削除 }else{ - // 2003.10.31 moca •s—v‚È+1‚ðíœ - // 2003.11.01 genta calloc‚Å0ƒNƒŠƒA‚ð•ÛØ‚·‚é + // 2003.10.31 moca ä¸è¦ãª+1を削除 + // 2003.11.01 genta callocã§0クリアをä¿è¨¼ã™ã‚‹ t = (char*)calloc( lcr, 1 ); } if( t==NULL){ @@ -85,7 +85,7 @@ bool RcCvt::convert(void) { while( !feof(fpi) ) { - // 2007.04.03 genta ƒtƒ@ƒCƒ‹––”ö‚Å“Ç‚Ýž‚݃Gƒ‰[‚É‚È‚é‚ÆÅIs‚ªd•¡‚µ‚Äo—Í‚³‚ê‚é + // 2007.04.03 genta ファイル末尾ã§èª­ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ã«ãªã‚‹ã¨æœ€çµ‚è¡ŒãŒé‡è¤‡ã—ã¦å‡ºåŠ›ã•ã‚Œã‚‹ if( NULL == fgets(buffer, nLine, fpi )){ break; } @@ -135,8 +135,8 @@ bool RcCvt::include(char*linestr) { strcpy( linestr, "\n" ); } - //2002.01.10 ‚ ‚ë‚© ƒŠƒ\[ƒX‚ÌDlgs.h‚ðíœ - else if( strstr( linestr, "Dlgs.h" ) != NULL ) //2002.01.15 ‚ ‚ë‚© elsif -> else if + //2002.01.10 ã‚ã‚㋠リソースã®Dlgs.hを削除 + else if( strstr( linestr, "Dlgs.h" ) != NULL ) //2002.01.15 ã‚ã‚ã‹ elsif -> else if { strcpy( linestr, "\n" ); } diff --git a/btool/RcCvt.h b/btool/RcCvt.h index 6e06353b92..eb9c288c21 100644 --- a/btool/RcCvt.h +++ b/btool/RcCvt.h @@ -1,4 +1,4 @@ -//// +//// // RcCvt : convert MSVC type resource file to Brc32 type. // 20010820 aroka @@ -14,13 +14,13 @@ class RcCvt { private: bool font(char*linestr); bool include(char*linestr); - //! ƒGƒ‰[•¶Žš—ñ‚̒ljÁ + //! エラー文字列ã®è¿½åŠ  bool setErr(char*errstr); private: - FILE *fpi; //!<•ÏŠ·Œ³(“ü—Í)ƒtƒ@ƒCƒ‹‚̃tƒ@ƒCƒ‹ƒ|ƒCƒ“ƒ^ - FILE *fpo; //!<•ÏŠ·æ(o—Í)ƒtƒ@ƒCƒ‹‚̃tƒ@ƒCƒ‹ƒ|ƒCƒ“ƒ^ - int nLine; //!<1s‚ÌÅ‘å’·D“à•”ƒoƒbƒtƒ@‚̉Šú‰»Žž‚Ƀoƒbƒtƒ@ƒTƒCƒY‚Æ‚µ‚ÄŽg‚í‚ê‚éD - char *strerr; //!< ƒGƒ‰[•¶Žš—ñ‚ւ̃|ƒCƒ“ƒ^ - char *buffer; //!< “Ç‚Ýž‚݃oƒbƒtƒ@‚ւ̃|ƒCƒ“ƒ^D + FILE *fpi; //!<変æ›å…ƒ(入力)ファイルã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒã‚¤ãƒ³ã‚¿ + FILE *fpo; //!<変æ›å…ˆ(出力)ファイルã®ãƒ•ã‚¡ã‚¤ãƒ«ãƒã‚¤ãƒ³ã‚¿ + int nLine; //!<1è¡Œã®æœ€å¤§é•·ï¼Žå†…部ãƒãƒƒãƒ•ã‚¡ã®åˆæœŸåŒ–時ã«ãƒãƒƒãƒ•ã‚¡ã‚µã‚¤ã‚ºã¨ã—ã¦ä½¿ã‚れる. + char *strerr; //!< エラー文字列ã¸ã®ãƒã‚¤ãƒ³ã‚¿ + char *buffer; //!< 読ã¿è¾¼ã¿ãƒãƒƒãƒ•ã‚¡ã¸ã®ãƒã‚¤ãƒ³ã‚¿ï¼Ž }; diff --git a/btool/mrc2brc.cpp b/btool/mrc2brc.cpp index ad9e4ef3bf..956b508a53 100644 --- a/btool/mrc2brc.cpp +++ b/btool/mrc2brc.cpp @@ -1,4 +1,4 @@ -//// +//// // rmc2brc : convert MSVC type resource file to Brc32 type. // 20010731 aroka diff --git a/btool/mrc2grc.cpp b/btool/mrc2grc.cpp index 45990eabb8..6d40dcfd25 100644 --- a/btool/mrc2grc.cpp +++ b/btool/mrc2grc.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include @@ -37,13 +37,13 @@ void convert(const char* infile, const char* outfile) while( '\0' != *p ){ if( sjis_1(p) && sjis_2(p+1) ){ *o++ = *p++; - // SJIS‚Ì2ƒoƒCƒg–Ú‚ª\‚¾‚Á‚½‚Æ‚«‚¾‚¯\‚ð•t‰Á‚·‚é + // SJISã®2ãƒã‚¤ãƒˆç›®ãŒ\ã ã£ãŸã¨ãã ã‘\を付加ã™ã‚‹ if( *p == '\\' ){ *o++ = '\\'; } *o++ = *p++; }else if( sjis_1(p) && *(p+1) == '\0' ){ - // 1byteŽŸ‰ñŽ‰z‚µ + // 1byte次回æŒè¶Šã— buffer[0] = *p++; buffer[1] = '\0'; carrierlen = 1;