From dcf4eb4082f9ade558137e645ccc22e669215a7e Mon Sep 17 00:00:00 2001 From: srz-zumix Date: Wed, 8 Apr 2015 08:20:45 +0900 Subject: [PATCH] update r811 --- doc/Doxyfile | 2 +- include/impl/iutest_xml_file_c.inl | 10 +++++----- include/internal/iutest_xml_file_c.h | 4 ++-- include/iutest_ver_c.h | 4 ++-- test/iutest_unit_tests.c | 7 +++++++ 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/doc/Doxyfile b/doc/Doxyfile index fc3086b..b99c460 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = iutest_c # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.5.0.9 +PROJECT_NUMBER = 1.5.0.10 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer diff --git a/include/impl/iutest_xml_file_c.inl b/include/impl/iutest_xml_file_c.inl index 0221770..8ded536 100644 --- a/include/impl/iutest_xml_file_c.inl +++ b/include/impl/iutest_xml_file_c.inl @@ -6,7 +6,7 @@ * * @author t.sirayanagi * @par copyright - * Copyright (C) 2012-2014, Takazumi Shirayanagi\n + * Copyright (C) 2012-2015, Takazumi Shirayanagi\n * This software is released under the new BSD License, * see LICENSE */ @@ -118,9 +118,9 @@ IUTEST_C_INL_INLINE IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlAttribute { return iuXmlFile_EscapeCharactor(dst, src, TRUE); } -IUTEST_C_INL_INLINE IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlText(char* dst, const char* src) -{ - return iuXmlFile_EscapeCharactor(dst, src, FALSE); -} +//IUTEST_C_INL_INLINE IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlText(char* dst, const char* src) +//{ +// return iuXmlFile_EscapeCharactor(dst, src, FALSE); +//} #endif diff --git a/include/internal/iutest_xml_file_c.h b/include/internal/iutest_xml_file_c.h index 2928690..5534305 100644 --- a/include/internal/iutest_xml_file_c.h +++ b/include/internal/iutest_xml_file_c.h @@ -6,7 +6,7 @@ * * @author t.sirayanagi * @par copyright - * Copyright (C) 2012-2014, Takazumi Shirayanagi\n + * Copyright (C) 2012-2015, Takazumi Shirayanagi\n * This software is released under the new BSD License, * see LICENSE */ @@ -29,7 +29,7 @@ IUTEST_ATTRIBUTE_UNUSED_ void iuXmlFile_OutputCDataSection(FILE* fp, const char* #endif IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlAttribute(char* dst, const char* src); -IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlText(char* dst, const char* src); +//IUTEST_ATTRIBUTE_UNUSED_ iuBOOL iuXmlFile_EscapeXmlText(char* dst, const char* src); #endif diff --git a/include/iutest_ver_c.h b/include/iutest_ver_c.h index 15cd137..01a22f3 100644 --- a/include/iutest_ver_c.h +++ b/include/iutest_ver_c.h @@ -16,11 +16,11 @@ #define INCG_IRIS_IUTEST_VER_C_H_D65CB7A7_D2AD_40FE_8F5F_8FBF376A0010_ /* define ============================================================*/ -#define IUTEST_C_VER 0x01050009 /*!< iutest version 1.5.0.9 */ +#define IUTEST_C_VER 0x01050010 /*!< iutest version 1.5.0.10 */ #define IUTEST_C_MAJORVER 0x01 /*!< Major Version */ #define IUTEST_C_MINORVER 0x05 /*!< Minor Version */ #define IUTEST_C_BUILD 0x00 /*!< Build */ -#define IUTEST_C_REVISION 0x09 /*!< Revision */ +#define IUTEST_C_REVISION 0x10 /*!< Revision */ /** * @mainpage diff --git a/test/iutest_unit_tests.c b/test/iutest_unit_tests.c index a630769..2242d65 100644 --- a/test/iutest_unit_tests.c +++ b/test/iutest_unit_tests.c @@ -140,3 +140,10 @@ IUTEST(FormatUnit, PrintTo) } } +IUTEST(XmlUnit, Escape) +{ + char str[64]; + iuXmlFile_EscapeXmlAttribute(str, "a<> b& \'\"c\r\n"); + IUTEST_ASSERT_STREQ("a<> b& '"c ", str); +} +