From: Koine Yuusuke(koinec) Date: Mon, 10 Aug 2015 09:18:24 +0000 (+0900) Subject: * WorkBackup: 2015/08/10(Mon) PM 18:18 (Support Error-code system for drd64_libeditte... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d5f7c871e2fda5a71d59f4d4d4042e6b5daef623;p=drdeamon64%2Fdrdeamon64.git * WorkBackup: 2015/08/10(Mon) PM 18:18 (Support Error-code system for drd64_libedittext_cursorinfo.c) --- diff --git a/libedittext/drd64_libedittext_cursorinfo.c b/libedittext/drd64_libedittext_cursorinfo.c index 3c072b0..71e104c 100644 --- a/libedittext/drd64_libedittext_cursorinfo.c +++ b/libedittext/drd64_libedittext_cursorinfo.c @@ -44,6 +44,7 @@ Comment: /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_Debug_CheckCursor 0x01 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_Debug_CheckCursor( @@ -143,6 +144,7 @@ goto_LibEditText_CursorInfo_Debug_CheckCursor_post: /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_GetCursor 0x02 LIBEDITTEXT_CURSORINFO_EXTERN LibEditText_Cursor * LibEditText_CursorInfo_GetCursor( @@ -154,12 +156,22 @@ LibEditText_Cursor * assert( NULL != p_tinfo ); if(( 0 > i_curid ) || ( p_tinfo->dw_maxcursors <= i_curid )) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_FAILED_ARG, 0x01, 0x01 ), + LOCATION( FUNCID_LibEditText_CursorInfo_GetCursor ), + errno, (QWord)i_curid, (QWord)p_tinfo->dw_maxcursors, __LINE__ ); + return NULL; } p_cursor = &(p_tinfo->t_cursor[i_curid]); if( 0 == p_cursor->dw_rangelines ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_BUG, 0x01, 0x02 ), + LOCATION( FUNCID_LibEditText_CursorInfo_GetCursor ), + errno, (QWord)i_curid, (QWord)p_tinfo->dw_maxcursors, __LINE__ ); + return NULL; } @@ -169,6 +181,7 @@ LibEditText_Cursor * /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_SetCurrentCursor 0x03 LIBEDITTEXT_CURSORINFO_EXTERN void LibEditText_CursorInfo_SetCurrentCursor( @@ -187,6 +200,7 @@ void /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_ClearCurrentCursor 0x04 LIBEDITTEXT_CURSORINFO_EXTERN void LibEditText_CursorInfo_ClearCurrentCursor( @@ -202,6 +216,7 @@ void /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_LocateCursor 0x05 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_LocateCursor( @@ -243,7 +258,6 @@ int } p_cursor->dw_start_lineid = p_lnow->dw_id; p_cursor->dw_start_line = dw_now; - //p_cursor->dw_start_line = dw_start; // Search & Set End Line --- dw_now = dw_curlrow; @@ -254,7 +268,6 @@ int } p_cursor->dw_end_lineid = p_lnow->dw_id; p_cursor->dw_end_line = dw_now; - //p_cursor->dw_end_line = dw_end; return 0x00; } @@ -262,6 +275,7 @@ int /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_JumpCursor 0x06 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_JumpCursor( @@ -276,11 +290,21 @@ int assert( NULL != p_cursor ); if( p_tinfo->dw_maxline <= dw_targline ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_FAILED_ARG, 0x01, 0x01 ), + LOCATION( FUNCID_LibEditText_CursorInfo_JumpCursor ), + errno, (QWord)dw_targline, (QWord)p_tinfo->dw_maxline, __LINE__ ); + return -0x01; } p_line = LibEditText_Section_SearchLine( p_tinfo, dw_targline ); if( NULL == p_line ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_FAILED_ARG, 0x01, 0x02 ), + LOCATION( FUNCID_LibEditText_CursorInfo_JumpCursor ), + errno, (QWord)dw_targline, (QWord)p_tinfo->dw_maxline, __LINE__ ); + return -0x02; } @@ -293,6 +317,7 @@ int /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_AllocCursor 0x07 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_AllocCursor( @@ -303,6 +328,11 @@ int LibEditText_Cursor *p_cursor; if( 0 == dw_ranges ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_FAILED_ARG, 0x01, 0x01 ), + LOCATION( FUNCID_LibEditText_CursorInfo_AllocCursor ), + errno, (QWord)dw_ranges, (QWord)0x00, __LINE__ ); + return -0x01; } @@ -313,6 +343,11 @@ int } if( DRD64_LIBEDITTEXT_DEFAULT_MAX_CURSORS == i_cnt ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_FAILCALL, 0x01, 0x02 ), + LOCATION( FUNCID_LibEditText_CursorInfo_AllocCursor ), + errno, (QWord)dw_ranges, (QWord)i_cnt, __LINE__ ); + return -0x02; } if( i_cnt == p_tinfo->dw_maxcursors ) { p_tinfo->dw_maxcursors++; } @@ -333,6 +368,7 @@ int /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_FreeCursor 0x08 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_FreeCursor( @@ -341,8 +377,15 @@ int { LibEditText_Cursor *p_cursor; + assert( NULL != p_tinfo ); + p_cursor = LibEditText_CursorInfo_GetCursor( p_tinfo, i_curid ); if( NULL == p_cursor ) { + LibBrownie_Error_SetErrorInfo( + DRD64_ERROR( DRD64_ERROR_PTN_CALLFUNC, 0x01, 0x01 ), + LOCATION( FUNCID_LibEditText_CursorInfo_FreeCursor ), + errno, (QWord)i_curid, (QWord)0x00, __LINE__ ); + return -0x01; } @@ -358,6 +401,7 @@ int /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_InitCursor 0x09 LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_InitCursor( @@ -386,6 +430,7 @@ int /*---------------------------------------------------------------------- ----------------------------------------------------------------------*/ +#define FUNCID_LibEditText_CursorInfo_TermCursor 0x0a LIBEDITTEXT_CURSORINFO_EXTERN int LibEditText_CursorInfo_TermCursor(