diff --git a/cr_generate_id.c b/cr_generate_id.c index 77071c1..c303af4 100644 --- a/cr_generate_id.c +++ b/cr_generate_id.c @@ -133,7 +133,7 @@ static u64 generatingCount = 0; // 現在生成中のID(起動時からの通算 int cr_print_flag = 0; // generate_id関数のイニシャライズ -int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] ) +int cr_generate_id_initialize( u8 err_buf[CR_ID_BUF_SIZE] ) { int ret_code = CR_GENID_SUCCESS; @@ -147,7 +147,7 @@ int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] ) ret_code = hsm_initialize(); if ( ret_code != CR_GENID_SUCCESS ) { - CR_ERR_BUFFER *cr_err_buf = (CR_ERR_BUFFER *)id_buf; + CR_ERR_BUFFER *cr_err_buf = (CR_ERR_BUFFER *)err_buf; memset( cr_err_buf, 0, sizeof( CR_ERR_BUFFER ) ); cr_err_buf->errorCode = ret_code; GetErrorInfo( cr_err_buf->callStack, &cr_err_buf->recordSize ); @@ -163,7 +163,7 @@ int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] ) // generate_id関数のファイナライズ -int cr_generate_id_finalize( u8 err[CR_ID_BUF_SIZE] ) +int cr_generate_id_finalize( u8 err_buf[CR_ID_BUF_SIZE] ) { int ret_code = CR_GENID_SUCCESS; @@ -175,7 +175,7 @@ int cr_generate_id_finalize( u8 err[CR_ID_BUF_SIZE] ) ret_code = hsm_finalize(); if ( ret_code != CR_GENID_SUCCESS ) { - CR_ERR_BUFFER *cr_err_buf = (CR_ERR_BUFFER *)id_buf; + CR_ERR_BUFFER *cr_err_buf = (CR_ERR_BUFFER *)err_buf; memset( cr_err_buf, 0, sizeof( CR_ERR_BUFFER ) ); cr_err_buf->errorCode = ret_code; GetErrorInfo( cr_err_buf->callStack, &cr_err_buf->recordSize ); diff --git a/cr_generate_id.h b/cr_generate_id.h index f7792f9..cce446d 100644 --- a/cr_generate_id.h +++ b/cr_generate_id.h @@ -145,9 +145,9 @@ typedef unsigned long long u64; #define CR_ID1_MASK 0x00000003FFFFFFFFll // 34bit #define CR_ID2_MASK 0xFFFFFFFFFFFFFFFFll // 64bit -extern int cr_generate_id_initialize( u8 err[CR_ID_BUF_SIZE] ); +extern int cr_generate_id_initialize( u8 err_buf[CR_ID_BUF_SIZE] ); extern int cr_generate_id( u32 deviceId[CR_NUM_OF_DEVICEID], u8 id[CR_ID_BUF_SIZE], u8 bondingOption ); -extern int cr_generate_id_finalize( u8 err[CR_ID_BUF_SIZE] ); +extern int cr_generate_id_finalize( u8 err_buf[CR_ID_BUF_SIZE] ); extern int cr_print_flag;