* Modify drcc_edittext.h/drcc_filetype.h for Non-test Headerfile

diff --git a/drcc/Makefile b/drcc/Makefile
index f88b3ac..b396d92 100644 (file)
--- a/drcc/Makefile
+++ b/drcc/Makefile
@@ -83,6 +83,7 @@ TEST_DRCC_HEADER = \
 
 all:   $(DRCC_TARGET) test
 test:  $(TEST_DRCC_TARGET)
+       ./$(TEST_DRCC_TARGET)
 
 #$(DRCC_TARGET): $(DRCC_OBJS)
 #      cp $(DRCC_TARGET) ..

diff --git a/drcc/drcc_edittext.h b/drcc/drcc_edittext.h
index e22772b..6e55168 100644 (file)
--- a/drcc/drcc_edittext.h
+++ b/drcc/drcc_edittext.h
@@ -43,6 +43,12 @@ Comment:
        #define DRCC_EDITTEXT_EXTERN            extern
 #endif
        
+#if defined DRD64_SRC_DRCC_EDITTEXT
+       #define DRCC_EDITTEXT_INTERNALFUNC
+#elif defined DRD64_SRC_TEST_DRCC_EDITTEXT
+       #define DRCC_EDITTEXT_INTERNALFUNC
+#endif
+
 #define        DRD64_DRCC_DEFAULT_ALLOC_TEXTINFO       256
 
 
@@ -80,10 +86,12 @@ typedef struct      {
 DRCC_EDITTEXT_EXTERN int DrCC_EditText_Term( void );
 DRCC_EDITTEXT_EXTERN int DrCC_EditText_Init( void );
 
+#ifdef DRCC_EDITTEXT_INTERNALFUNC
 DWord  DrCC_EditText_GetMaxNum_TextInfo(void);
 DWord  DrCC_EditText_GetAllocNum_TextInfo(void);
 Drd64_Drcc_TextInfo *DrCC_EditText_AllocTextInfo( void );
 int DrCC_EditText_FreeTextInfo( Drd64_Drcc_TextInfo *p_textinfo );
+#endif
 
 #endif /* DRD64_HEADER_DRCC_EDITTEXT */
 

diff --git a/drcc/drcc_filetype.h b/drcc/drcc_filetype.h
index 5c39da0..248de44 100644 (file)
--- a/drcc/drcc_filetype.h
+++ b/drcc/drcc_filetype.h
@@ -43,6 +43,12 @@ Comment:
        #define DRCC_FILETYPE_EXTERN    extern
 #endif
 
+#if defined DRD64_SRC_DRCC_FILETYPE
+       #define DRCC_FILETYPE_INTERNALFUNC
+#elif defined DRD64_SRC_TEST_DRCC_FILETYPE
+       #define DRCC_FILETYPE_INTERNALFUNC
+#endif
+
 #define        DRD64_DRCC_FILETYPE_BINARY      0
 #define        DRD64_DRCC_FILETYPE_TEXT        1
 
@@ -110,6 +116,10 @@ DRCC_FILETYPE_EXTERN
 int Drcc_FileType_CheckFileType(
                Drd64_Drcc_FileType *p_filetype, char *pstr_filename );
 
+#ifdef DRCC_FILETYPE_INTERNALFUNC
+char *Drcc_FileType_GetFileExtPosition( char *pstr_filepath );
+#endif
+
 #endif /* DRD64_HEADER_XXX */
 
 /* EOF of drd64_.h ----------------------------------- */

diff --git a/drcc/test_drcc_edittext.c b/drcc/test_drcc_edittext.c
index f21a660..2ac7f4d 100644 (file)
--- a/drcc/test_drcc_edittext.c
+++ b/drcc/test_drcc_edittext.c
@@ -67,7 +67,7 @@ void Test_DrCC_EditText_AllocTextInfo_test00_001(void)
                                                                + DRD64_DRCC_DEFAULT_ALLOC_TEXTINFO);
                                i_cnt++ )       {
                p_tinfo[i_cnt]  = DrCC_EditText_AllocTextInfo();
-               CU_ASSERT_FATAL( NULL != p_tinfo[i_cnt] );
+               CU_ASSERT( NULL != p_tinfo[i_cnt] );
        }
                
        for( i_cnt = 0; i_cnt < (DRD64_DRCC_DEFAULT_ALLOC_TEXTINFO * 2); i_cnt++ )      {
@@ -82,6 +82,15 @@ void Test_DrCC_EditText_AllocTextInfo_test00_001(void)
 }
 
 
+/* DrCC_EditText_AllocTextInfo ****************************************/
+/*--------------------------------------------------------------------*/
+void Test_DrCC_EditText_FreeTextInfo_test00_001(void)
+{
+       CU_ASSERT( 0x00 != DrCC_EditText_FreeTextInfo( NULL ) );
+       return;
+}
+
+
 /* DrCC_EditText_Init *************************************************/
 /*--------------------------------------------------------------------*/
 void Test_DrCC_EditText_Init_test00_001(void)
@@ -151,6 +160,8 @@ int
 
        CU_add_test( pt_edittext, "EditText_AllocTextInfo_test00_001",
                                                                Test_DrCC_EditText_AllocTextInfo_test00_001 );
+       CU_add_test( pt_edittext, "EditText_FreeTextInfo_test00_001",
+                                                               Test_DrCC_EditText_FreeTextInfo_test00_001 );
 
        CU_add_test( pt_edittext, "EditText_Term_test00_002",
                                                                Test_DrCC_EditText_Term_test00_002 );

diff --git a/drcc/test_drcc_filetype.c b/drcc/test_drcc_filetype.c
index 0d1c4c6..b533df4 100644 (file)
--- a/drcc/test_drcc_filetype.c
+++ b/drcc/test_drcc_filetype.c
@@ -34,10 +34,9 @@ Function:
 Comment: 
 ----------------------------------------------------------------------*/
 
-#include"drcc.h"
 #define DRD64_SRC_TEST_DRCC_FILETYPE
+#include"drcc.h"
 #include"test_drcc.h"
-#include"test_drcc_filetype.h"
 
 /* DrCC_FileType_GetFileExtPosition ***********************************/
 /*--------------------------------------------------------------------*/