Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify parameter type from reference to value #344

Merged
merged 1 commit into from
Jun 14, 2020
Merged

Modify parameter type from reference to value #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/jdlib/misccharcode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
// 2バイト目 0xA1〜0xFE
#define EUC_RANGE_MULTI( target ) ( (unsigned char)( target - 0xA1 ) < 0x5E )
//
bool MISC::is_euc( const char* input, size_t& read_byte )
bool MISC::is_euc( const char* input, size_t read_byte )
{
if( ! input ) return false;

Expand Down Expand Up @@ -131,7 +131,7 @@ bool MISC::is_jis( const char* input, size_t& byte )
// 0x80〜0xFC
#define SJIS_RANGE_2_T( target ) ( (unsigned char)( target - 0x80 ) < 0x7D )
//
bool MISC::is_sjis( const char* input, size_t& read_byte )
bool MISC::is_sjis( const char* input, size_t read_byte )
{
if( ! input ) return false;

Expand Down Expand Up @@ -187,7 +187,7 @@ bool MISC::is_sjis( const char* input, size_t& read_byte )
// [ 2バイト目以降 ] 0x80〜0xBF
#define UTF_RANGE_MULTI_BYTE( target ) ( (unsigned char)( target - 0x80 ) < 0x40 )
//
bool MISC::is_utf( const char* input, size_t& read_byte )
bool MISC::is_utf( const char* input, size_t read_byte )
{
if( ! input ) return false;

Expand Down Expand Up @@ -258,6 +258,7 @@ int MISC::judge_char_code( const std::string& str )
if( is_jis( str.c_str(), read_byte ) ) code = CHARCODE_JIS;
// JISの判定で最後まで進んでいたら制御文字かアスキー
else if( read_byte == str.length() ) code = CHARCODE_ASCII;
// is_jis()でASCII範囲外のバイトが現れた箇所から判定する
// UTF-8の範囲
else if( is_utf( str.c_str(), read_byte ) ) code = CHARCODE_UTF;
// EUC-JPの範囲
Expand Down
6 changes: 3 additions & 3 deletions src/jdlib/misccharcode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ namespace MISC
CHARCODE_UTF
};

bool is_euc( const char* input, size_t& read_byte );
bool is_euc( const char* input, size_t read_byte );
bool is_jis( const char* input, size_t& read_byte );
bool is_sjis( const char* input, size_t& read_byte );
bool is_utf( const char* input, size_t& read_byte );
bool is_sjis( const char* input, size_t read_byte );
bool is_utf( const char* input, size_t read_byte );
int judge_char_code( const std::string& str );
}

Expand Down