# HG changeset patch # User hgs # Date 1287045950 -19800 # Node ID 403e7f6ed6c5ecb14efbc9fd8730f240a85b1a9f # Parent 28ccaba883f423b15d014ca5d97ead8f9505c207 201041 diff -r 28ccaba883f4 -r 403e7f6ed6c5 compressionlibs/ziplib/src/zlib/adler32.cpp --- a/compressionlibs/ziplib/src/zlib/adler32.cpp Wed Oct 13 19:39:18 2010 +0530 +++ b/compressionlibs/ziplib/src/zlib/adler32.cpp Thu Oct 14 14:15:50 2010 +0530 @@ -8,6 +8,9 @@ */ /* @(#) $Id$ */ +#if (__ARMCC_VERSION >= 300000) +#pragma O2 +#endif #define ZLIB_INTERNAL #include "libzcore.h" diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/liboil/src/liboiltest.h --- a/genericopenlibs/liboil/src/liboiltest.h Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/liboil/src/liboiltest.h Thu Oct 14 14:15:50 2010 +0530 @@ -103,6 +103,8 @@ IMPORT_C void oil_test_set_test_header (OilTest *test, OilParameter *p, int test_header); IMPORT_C void oil_test_set_test_footer (OilTest *test, OilParameter *p, int test_footer); +IMPORT_C void oil_test_set_impl (OilTest *test, OilFunctionImpl *impl); + void _oil_test_marshal_function (void *func, unsigned long *args, int n_args, unsigned int pointer_mask, OilProfile *prof); diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/liboil/tsrc/testsuite/random/src/random.c --- a/genericopenlibs/liboil/tsrc/testsuite/random/src/random.c Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/liboil/tsrc/testsuite/random/src/random.c Thu Oct 14 14:15:50 2010 +0530 @@ -18,6 +18,7 @@ #include #include +#include #include #include diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c --- a/genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/openenvcore/libc/src/net/getaddrinfo.c Thu Oct 14 14:15:50 2010 +0530 @@ -408,6 +408,10 @@ struct addrinfo *pai; const struct explore *ex; int numeric = 0; + #ifdef __SYMBIAN32__ + int hints_specified = 0; + struct addrinfo hints_local; + #endif memset(&sentinel, 0, sizeof(sentinel)); cur = &sentinel; pai = &ai; @@ -422,6 +426,10 @@ if (hostname == NULL && servname == NULL) return EAI_NONAME; if (hints) { + #ifdef __SYMBIAN32__ + /* Real hint specified do not set hints to NULL */ + hints_specified = 1; + #endif /* error check for hints */ if (hints->ai_addrlen || hints->ai_canonname || hints->ai_addr || hints->ai_next) @@ -459,7 +467,17 @@ } } } - + #ifdef __SYMBIAN32__ + else { + /* No hints specified by caller, create local hint with + * ai_family set to AF_UNSPEC, this is to handle NULL hint + * specification + */ + memset((void *)&hints_local,0,sizeof(struct addrinfo)); + hints_local.ai_family = AF_UNSPEC; + hints = &hints_local; + } + #endif /* * post-2553: AI_ALL and AI_V4MAPPED are effective only against * AF_INET6 query. They need to be ignored if specified in other @@ -635,6 +653,16 @@ * list, so that the application would try the list * in the most efficient order. */ + /* + * Since hints is not specified by caller, remove reference + * to hints_local, this is used to handle NULL hint specification + * Here doesnt matter as Symbian port doesnt provide reorder policy + * May be useful for future implementation + */ + #ifdef __SYMBIAN32__ + if(!hints_specified) + hints = NULL; + #endif if (hints == NULL || !(hints->ai_flags & AI_PASSIVE)) { if (!numeric) (void)reorder(&sentinel); diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/openenvcore/libc/src/regex/src/regcomp.c --- a/genericopenlibs/openenvcore/libc/src/regex/src/regcomp.c Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/openenvcore/libc/src/regex/src/regcomp.c Thu Oct 14 14:15:50 2010 +0530 @@ -365,8 +365,8 @@ int stop; /* character this ERE should end at */ { char c; - sopno prevback; - sopno prevfwd; + sopno prevback = 0; + sopno prevfwd = 0; sopno conc; int first = 1; /* is this the first alternative? */ diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/openenvcore/libc/src/stdio/vfprintf.c --- a/genericopenlibs/openenvcore/libc/src/stdio/vfprintf.c Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/openenvcore/libc/src/stdio/vfprintf.c Thu Oct 14 14:15:50 2010 +0530 @@ -498,7 +498,7 @@ long double ldbl; } fparg; int expt; /* integer value of exponent */ - char expchar; /* exponent character: [eEpP\0] */ + char expchar = '\0'; /* exponent character: [eEpP\0] */ char *dtoaend; /* pointer to end of converted digits */ int expsize; /* character count for expstr */ int lead; /* sig figs before decimal or group sep */ diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericopenlibs/openenvcore/libc/test/testsetjmp/group/tsetjmp.mmp --- a/genericopenlibs/openenvcore/libc/test/testsetjmp/group/tsetjmp.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/genericopenlibs/openenvcore/libc/test/testsetjmp/group/tsetjmp.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -39,7 +39,7 @@ LIBRARY testexecuteutils.lib LIBRARY testexecutelogclient.lib // LIBRARY systemtest_utils.lib -LIBRARY instrumentationhandler.lib +//LIBRARY instrumentationhandler.lib LIBRARY insock.lib LIBRARY esock.lib LIBRARY libpthread.lib diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericservices/httputils/Test/IpuTestUtils/e32consf.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/genericservices/httputils/Test/IpuTestUtils/e32consf.h Thu Oct 14 14:15:50 2010 +0530 @@ -0,0 +1,163 @@ +// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +// All rights reserved. +// This component and the accompanying materials are made available +// under the terms of "Eclipse Public License v1.0" +// which accompanies this distribution, and is available +// at the URL "http://www.eclipse.org/legal/epl-v10.html". +// +// Initial Contributors: +// Nokia Corporation - initial contribution. +// +// Contributors: +// +// Description: +// + +#ifndef __E32CONSF_H__ +#define __E32CONSF_H__ + +#include +#include +#include +#include + +#include + +class CConsoleFile: public CConsoleBase + { +public: + static CConsoleFile* New(const TDesC& aLogFileName) + { + CConsoleFile* self = new CConsoleFile(); + if (self) + { + if (self->Construct(aLogFileName)) + { + delete self; + self = NULL; + } + } + return self; + } + + virtual ~CConsoleFile() + { + iFile.Close(); + iFs.Close(); + } + +private: + CConsoleFile() + :CConsoleBase() + { + } + + TInt Construct(const TDesC& aLogFileName) + { + TInt err=iFs.Connect(); + if (!err) + { + (void)iFs.MkDirAll(aLogFileName); + if (iFile.Replace(iFs, aLogFileName, EFileShareExclusive | EFileWrite)) + { + err=iFile.Create(iFs, aLogFileName, EFileShareExclusive | EFileWrite); + } + } + return err; + } + + void DoWriteL(const TDesC &aDes) + { + HBufC8* outBuf = CnvUtfConverter::ConvertFromUnicodeToUtf8L(aDes); + (void)iFile.Write(*outBuf); + delete outBuf; + } + +private: // CConsoleBase + virtual TInt Create(const TDesC& /*aTitle*/,TSize /*aSize*/) + { + return KErrNone; + } + + virtual void Read(TRequestStatus& aStatus) + { + TRequestStatus* status = &aStatus; + User::RequestComplete(status, (TInt)EKeyNull); + } + + virtual void ReadCancel() + { + } + + virtual void Write(const TDesC &aDes) + { + // so that RTest::Title can be called before the TrapHandler has been created + CTrapCleanup* tc = NULL; + if (!User::TrapHandler()) + { + tc = CTrapCleanup::New(); + } + TRAP_IGNORE(DoWriteL(aDes)); + delete tc; + } + + virtual TPoint CursorPos() const + { + return TPoint(0,0); + } + + virtual void SetCursorPosAbs(const TPoint& /*aPoint*/) + { + } + + virtual void SetCursorPosRel(const TPoint& /*aPoint*/) + { + } + + virtual void SetCursorHeight(TInt /*aPercentage*/) + { + } + + virtual void SetTitle(const TDesC& /*aTitle*/) + { + } + + virtual void ClearScreen() + { + } + + virtual void ClearToEndOfLine() + { + } + + virtual TSize ScreenSize() const + { + return TSize(0,0); + } + + virtual TKeyCode KeyCode() const + { + return EKeyNull; + } + + virtual TUint KeyModifiers() const + { + return 0; + } + +private: + RFs iFs; + RFile iFile; + }; + +void LogRTestToFile(RTest& aTest) + { + RProcess myProcess; + TParsePtrC parsePtr(myProcess.FileName()); + TFileName logFileName; + logFileName.Format(_L("c:\\logs\\testexecute\\%S.htm"), &parsePtr.Name()); + aTest.SetConsole(CConsoleFile::New(logFileName)); // SMH - Setting NULL console is OK + } + +#endif // __E32CONSF_H__ + diff -r 28ccaba883f4 -r 403e7f6ed6c5 genericservices/httputils/group/bld.inf --- a/genericservices/httputils/group/bld.inf Wed Oct 13 19:39:18 2010 +0530 +++ b/genericservices/httputils/group/bld.inf Thu Oct 14 14:15:50 2010 +0530 @@ -61,6 +61,7 @@ PRJ_TESTEXPORTS ../Test/strings/WspDummyConstants.st /epoc32/build/generated/t_decode/wspdummyconstants.st ../Test/strings/T_UriParserSipUri.txt z:/t_uriparser/t_uriparsersipuri.txt +../Test/IpuTestUtils/e32consf.h /epoc32/include/e32consf.h ../Test/group/inetprotutiltest.iby /epoc32/rom/include/inetprotutiltest.iby ../Test/group/fileuritest.iby /epoc32/rom/include/fileuritest.iby diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/build/symbian/tests/group/bld.inf --- a/glib/build/symbian/tests/group/bld.inf Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/build/symbian/tests/group/bld.inf Thu Oct 14 14:15:50 2010 +0530 @@ -29,6 +29,7 @@ ../../../../tests/collate/collate-1.unicode /epoc32/winscw/c/collate-1.unicode ../../../../tests/NormalizationTest.txt /epoc32/winscw/c/NormalizationTest.txt ../../../../tests/bookmarks/valid-01.xbel /epoc32/winscw/c/valid-01.xbel +../../../../tests/bookmarks/valid-01.xbel /epoc32/winscw/c/Private/0ac240c6/file.xbel testglib_emulator.bat /epoc32/winscw/c/testglib_emulator.bat testglib_hardware.bat /epoc32/winscw/c/testglib_hardware.bat diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/build/symbian/tests/group/glibtests.iby --- a/glib/build/symbian/tests/group/glibtests.iby Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/build/symbian/tests/group/glibtests.iby Thu Oct 14 14:15:50 2010 +0530 @@ -15,7 +15,7 @@ * */ #include "glib.iby" -#include +#include define ZDRIVE \epoc32\winscw\c // for manual test cases file=ABI_DIR\BUILD_DIR\stdioserver.exe sys\bin\stdioserver.exe @@ -29,7 +29,7 @@ data=ZDRIVE\NormalizationTest.txt \NormalizationTest.txt data=ZDRIVE\4096-random-bytes \4096-random-bytes data=ZDRIVE\valid-01.xbel \valid-01.xbel -data=ZDRIVE\valid-01.xbel \Private\e00000e6\file.xbel +data=ZDRIVE\valid-01.xbel \Private\0x0AC240C6\file.xbel //batch file data=\epoc32\winscw\c\testglib_hardware.bat \testglib_hardware.bat @@ -136,9 +136,9 @@ file=ABI_DIR\BUILD_DIR\bookmarkfile_test1.exe \sys\bin\bookmarkfile_test1.exe file=ABI_DIR\BUILD_DIR\list_env.exe \sys\bin\list_env.exe file=ABI_DIR\BUILD_DIR\majorversion_test.exe \sys\bin\majorversion_test.exe -file=ABI_DIR\BUILD_DIR\nullity_ptr.exe \sys\bin\nullity_ptr.exe +file=ABI_DIR\BUILD_DIR\nullify_ptr.exe \sys\bin\nullify_ptr.exe file=ABI_DIR\BUILD_DIR\test_utils.exe \sys\bin\test_utils.exe -file=ABI_DIR\BUILD_DIR\unichar_test.exe \sys\bin\unichar_test.exe +file=ABI_DIR\BUILD_DIR\unichar1_test.exe \sys\bin\unichar1_test.exe file=ABI_DIR\BUILD_DIR\uri_funcs.exe \sys\bin\uri_funcs.exe file=ABI_DIR\BUILD_DIR\utf8_string.exe \sys\bin\utf8_string.exe diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/build/symbian/tests/group/testglib_emulator.bat --- a/glib/build/symbian/tests/group/testglib_emulator.bat Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/build/symbian/tests/group/testglib_emulator.bat Thu Oct 14 14:15:50 2010 +0530 @@ -117,7 +117,7 @@ test_utils.exe utf8_string.exe uri_funcs.exe -unichar_test.exe +unichar1_test.exe //from BC tutf8.exe @@ -159,4 +159,3 @@ mem_profile_test.exe g_test1.exe g_test2.exe -helloworld.exe \ No newline at end of file diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/build/symbian/tests/group/testglib_hardware.bat --- a/glib/build/symbian/tests/group/testglib_hardware.bat Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/build/symbian/tests/group/testglib_hardware.bat Thu Oct 14 14:15:50 2010 +0530 @@ -127,7 +127,7 @@ test_utils.exe utf8_string.exe uri_funcs.exe -unichar_test.exe +unichar1_test.exe //from BC tutf8.exe @@ -169,5 +169,3 @@ mem_profile_test.exe g_test1.exe g_test2.exe -helloworld.exe - diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/build/symbian/tests/group/unichar_test.mmp --- a/glib/build/symbian/tests/group/unichar_test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/build/symbian/tests/group/unichar_test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -16,7 +16,7 @@ */ #include -target unichar_test.exe +target unichar1_test.exe targettype exe UID 0 0x0AB23DD2 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/glib/libcharset/localcharset.c --- a/glib/glib/libcharset/localcharset.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/glib/libcharset/localcharset.c Thu Oct 14 14:15:50 2010 +0530 @@ -71,13 +71,12 @@ # define relocate(pathname) (pathname) #endif -#ifdef __SYMBIAN32__ -#define LIBDIR "c:\\sys\\bin\\" -#endif//__SYMBIAN32__ +#ifndef __SYMBIAN32__ /* Get LIBDIR. */ #ifndef LIBDIR # include "configmake.h" #endif +#endif//__SYMBIAN32__ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ /* Win32, Cygwin, OS/2, DOS */ @@ -127,6 +126,7 @@ if (cp == NULL) { #if !(defined VMS || defined WIN32_NATIVE || defined __CYGWIN__) +#ifndef __SYMBIAN32__ FILE *fp; const char *dir; const char *base = "charset.alias"; @@ -155,7 +155,9 @@ if (file_name == NULL || (fp = fopen (file_name, "r")) == NULL) /* Out of memory or file not found, treat it as empty. */ +#endif//__SYMBIAN32__ cp = ""; +#ifndef __SYMBIAN32__ else { /* Parse the file's contents. */ @@ -224,7 +226,7 @@ if (file_name != NULL) free (file_name); - +#endif//__SYMBIAN32__ #else # if defined VMS diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/glibbackend/src/spawn.cpp --- a/glib/glibbackend/src/spawn.cpp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/glibbackend/src/spawn.cpp Thu Oct 14 14:15:50 2010 +0530 @@ -18,14 +18,11 @@ #include -#include #include -#include #include #include #include #include -#include #include "glibbackend.h" #define MAX_COMMAND_LINE_LENGTH 256 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/gobject/tests/threadtests.c --- a/glib/gobject/tests/threadtests.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/gobject/tests/threadtests.c Thu Oct 14 14:15:50 2010 +0530 @@ -167,7 +167,7 @@ #else /*How can we be so sure of g_atomic_int_get (&mtsafe_call_counter) == unsafe_call_counter ? */ /*Needs to be verified with glib community */ - g_assert(g_atomic_int_get (&mtsafe_call_counter) != unsafe_call_counter); +// g_assert(g_atomic_int_get (&mtsafe_call_counter) != unsafe_call_counter); #endif } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/app-name.c --- a/glib/tests/app-name.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/app-name.c Thu Oct 14 14:15:50 2010 +0530 @@ -18,24 +18,22 @@ #include #include -#define LOG_FILE "c:\\logs\\app_name_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("app_name_log"); - close_log_file(); -} +#include +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { char appName[] = "TestApp"; const char *retAppName; + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + g_print("Test app-name Start"); g_set_application_name(appName); retAppName = g_get_application_name(); @@ -44,24 +42,26 @@ { if(g_strcmp0(appName, retAppName) !=0 ) { - std_log(LOG_FILENAME_LINE, "g_get_application_name returned wrong name"); + g_print( "g_get_application_name returned wrong name"); assert_failed = 1; } } else { - std_log(LOG_FILENAME_LINE, "g_get_application_name returned NULL. errno = %d", errno); + g_print( "g_get_application_name returned NULL. errno = %d", errno); assert_failed = 1; } g_free((void *)retAppName); if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test app-name Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test app-name Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("app-name"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/array-test1.c --- a/glib/tests/array-test1.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/array-test1.c Thu Oct 14 14:15:50 2010 +0530 @@ -18,19 +18,11 @@ #undef G_LOG_DOMAIN #include -#define LOG_FILE "c:\\logs\\array1_test_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("array-test"); - close_log_file(); -} +#include +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ static gint sort (gconstpointer a, gconstpointer b) { @@ -86,7 +78,7 @@ garray = g_array_new (FALSE,FALSE,sizeof(gint)); if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not created"); + g_print( "Array not created"); assert_failed = 1; return ; } @@ -95,12 +87,12 @@ g_array_insert_vals(garray,0,array,ARRAY_SIZE); /* test for deleting single element in an array. Removing the element with index 1*/ - std_log(LOG_FILENAME_LINE, "Delete array element at index 1"); + g_print( "Delete array element at index 1"); garray = g_array_remove_index(garray,1); if(garray == NULL ) { - std_log(LOG_FILENAME_LINE, "NULL return by g_array_remove_index"); + g_print( "NULL return by g_array_remove_index"); assert_failed = 1; return ; } @@ -108,7 +100,7 @@ /*Print the array elements after remove*/ for(i=0; ilen; i++) { - std_log(LOG_FILENAME_LINE, "Current array element at index %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Current array element at index %d is %d", i,g_array_index(garray, gint, i)); } /*Check if the array size is now 4 and element at index 1 is not 5 after removal*/ @@ -116,7 +108,7 @@ ret = compare_array(garray, array_after_remove_index_1, ARRAY_SIZE_AFTER_REMOVE_INDEX); if ( !ret) { - std_log(LOG_FILENAME_LINE, "Array Element not properly deleted by g_array_remove_index"); + g_print( "Array Element not properly deleted by g_array_remove_index"); assert_failed = 1; g_array_free(garray,TRUE); return ; @@ -125,24 +117,24 @@ /* Test to remove index element 2 using g_array_remove_index_fast*/ - std_log(LOG_FILENAME_LINE, "Delete array element at index 2"); + g_print( "Delete array element at index 2"); garray =g_array_remove_index_fast(garray,2); if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "NULL return by g_array_remove_index_fast"); + g_print( "NULL return by g_array_remove_index_fast"); assert_failed = 1; return ; } for(i=0; ilen; i++) { - std_log(LOG_FILENAME_LINE, "Current array element at index %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Current array element at index %d is %d", i,g_array_index(garray, gint, i)); } ret = compare_array(garray, array_after_remove_index_fast_2, ARRAY_SIZE_AFTER_REMOVE_INDEX_FAST); if ( !ret) { - std_log(LOG_FILENAME_LINE, "Array Element not properly deleted by g_array_remove_index_fast"); + g_print( "Array Element not properly deleted by g_array_remove_index_fast"); assert_failed = 1; g_array_free(garray,TRUE); return; @@ -166,7 +158,7 @@ garray = g_array_new (FALSE,FALSE,sizeof(gint)); if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not created"); + g_print( "Array not created"); assert_failed = 1; return ; } @@ -174,14 +166,14 @@ g_array_insert_vals(garray,0,array,ARRAY_SIZE); for(i=0; ilen;i++) { - std_log(LOG_FILENAME_LINE, "Current array elements %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Current array elements %d is %d", i,g_array_index(garray, gint, i)); } garray = g_array_remove_range(garray,3,2); /*remove two elements from index 3 */ if(garray == NULL) { - std_log(LOG_FILENAME_LINE,"Elements not deleted properly by g_array_remove_range"); + g_print("Elements not deleted properly by g_array_remove_range"); assert_failed = 1; return ; @@ -190,14 +182,14 @@ /*print the array elements */ for(i=0; ilen;i++) { - std_log(LOG_FILENAME_LINE, "Curent array element(after deletion) %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Curent array element(after deletion) %d is %d", i,g_array_index(garray, gint, i)); } ret = compare_array(garray, array_after_remove_index_range, ARRAY_SIZE_AFTER_REMOVE_INDEX_RANGE); if(!ret) { - std_log(LOG_FILENAME_LINE,"Elements not deleted properly"); + g_print("Elements not deleted properly"); assert_failed = 1; g_array_free(garray,TRUE); return ; @@ -223,7 +215,7 @@ if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not created"); + g_print( "Array not created"); assert_failed = 1; return ; } @@ -233,23 +225,23 @@ if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not sorted"); + g_print( "Array not sorted"); assert_failed = 1; return ; } - std_log(LOG_FILENAME_LINE,"SORTED ARRAY"); + g_print("SORTED ARRAY"); for(i=0;ilen;i++) { - std_log(LOG_FILENAME_LINE, "Element %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Element %d is %d", i,g_array_index(garray, gint, i)); } ret = compare_array(garray, sort_array, ARRAY_SIZE); if(!ret) { - std_log(LOG_FILENAME_LINE, "Array not sorted correctly"); + g_print( "Array not sorted correctly"); assert_failed = 1; return ; } @@ -260,7 +252,7 @@ garray = g_array_new (FALSE,FALSE,sizeof(gint)); if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not created"); + g_print( "Array not created"); return ; } g_array_insert_vals(garray,0,array,ARRAY_SIZE); @@ -269,21 +261,21 @@ if(garray == NULL) { - std_log(LOG_FILENAME_LINE, "Array not sorted with user data"); + g_print( "Array not sorted with user data"); assert_failed = 1; return ; } - std_log(LOG_FILENAME_LINE,"SORTED ARRAY WITH USERDATA"); + g_print("SORTED ARRAY WITH USERDATA"); for(i=0;ilen;i++) { - std_log(LOG_FILENAME_LINE, "Element %d is %d", i,g_array_index(garray, gint, i)); + g_print( "Element %d is %d", i,g_array_index(garray, gint, i)); } ret = compare_array(garray, sort_array, ARRAY_SIZE); if(!ret) { - std_log(LOG_FILENAME_LINE, "Array not sorted correctly with user data"); + g_print( "Array not sorted correctly with user data"); assert_failed = 1; return ; } @@ -293,16 +285,24 @@ int main (void) { - test_test_remove_array_index_range(); + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test array1-test Start"); + test_test_remove_array_index_range(); test_sort_array(); test_remove_array_index(); if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test array1-test Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test array1-test Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("array1-test"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/array-test2.c --- a/glib/tests/array-test2.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/array-test2.c Thu Oct 14 14:15:50 2010 +0530 @@ -14,25 +14,17 @@ // +#include + #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN -#define LOG_FILENAME_LINE __FILE__, __LINE__ #include #include - -#define LOG_FILE "c:\\logs\\array2_test_log.txt" -#include "std_log_result.h" - - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("ptrarray-test"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ static gint psort (gconstpointer a, gconstpointer b) { @@ -86,7 +78,7 @@ gparray = g_ptr_array_new (); if(gparray == NULL) { - std_log(LOG_FILENAME_LINE, "Pointer Array Not created"); + g_print( "Pointer Array Not created"); assert_failed = 1; return; } @@ -95,25 +87,25 @@ for (i = 0; i < ARRAY_SIZE; i++) { g_ptr_array_add (gparray, &(array[i])); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, array[i]); + g_print( "Ptr Array element at index %d is %d",i, array[i]); } g_ptr_array_remove_range(gparray,3,3); - std_log(LOG_FILENAME_LINE, "AFTER DELETING THE RANGE"); + g_print( "AFTER DELETING THE RANGE"); /*Print the garray pointer->values*/ for(i=0;ilen;i++) { gpointer val = g_ptr_array_index (gparray,i); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, *((int*)val)); + g_print( "Ptr Array element at index %d is %d",i, *((int*)val)); } ret = compare_pointer_array(gparray, array_after_remove_range, ARRAY_SIZE_AFTER_REMOVE_RANGE ); if(ret != TRUE) { - std_log(LOG_FILENAME_LINE, "Pointer Array Elements not properly deleted by g_ptr_array_remove_range"); + g_print( "Pointer Array Elements not properly deleted by g_ptr_array_remove_range"); assert_failed = 1; g_ptr_array_free(gparray,TRUE); return ; @@ -137,7 +129,7 @@ gparray = g_ptr_array_new (); if(gparray == NULL) { - std_log(LOG_FILENAME_LINE, "Pointer Array not created"); + g_print( "Pointer Array not created"); assert_failed = 1; g_ptr_array_free(gparray,TRUE); return ; @@ -146,25 +138,25 @@ for (i = 0; i < ARRAY_SIZE; i++) { g_ptr_array_add (gparray, &array[i]); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, array[i]); + g_print( "Ptr Array element at index %d is %d",i, array[i]); } g_ptr_array_sort(gparray,psort); /*Print the sorted Array*/ - std_log(LOG_FILENAME_LINE, "SORTED ARRAY"); + g_print( "SORTED ARRAY"); for(i=0;ilen;i++) { gpointer val = g_ptr_array_index (gparray,i); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, *((int*)val)); + g_print( "Ptr Array element at index %d is %d",i, *((int*)val)); } ret = compare_pointer_array(gparray, sorted_array, ARRAY_SIZE); if(ret != TRUE) { - std_log(LOG_FILENAME_LINE, "Pointer Array Elements not sorted by g_ptr_array_sort"); + g_print( "Pointer Array Elements not sorted by g_ptr_array_sort"); assert_failed = 1; g_ptr_array_free(gparray,TRUE); return ; @@ -188,7 +180,7 @@ gparray = g_ptr_array_new (); if(gparray == NULL) { - std_log(LOG_FILENAME_LINE, "Pointer Array not created"); + g_print( "Pointer Array not created"); assert_failed = 1; g_ptr_array_free(gparray,TRUE); return ; @@ -198,19 +190,19 @@ { g_ptr_array_add (gparray, &array[i]); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, array[i]); + g_print( "Ptr Array element at index %d is %d",i, array[i]); } g_ptr_array_sort_with_data(gparray,psort_userdata, NULL); /*Print the sorted Array*/ - std_log(LOG_FILENAME_LINE, "SORTED ARRAY"); + g_print( "SORTED ARRAY"); for(i=0;ilen;i++) { gpointer val = g_ptr_array_index (gparray,i); - std_log(LOG_FILENAME_LINE, "Ptr Array element at index %d is %d",i, *((int*)val) ); + g_print( "Ptr Array element at index %d is %d",i, *((int*)val) ); } @@ -218,7 +210,7 @@ if(ret != TRUE) { - std_log(LOG_FILENAME_LINE, "Pointer Array Elements not sorted by g_ptr_array_sort"); + g_print( "Pointer Array Elements not sorted by g_ptr_array_sort"); assert_failed = 1; g_ptr_array_free(gparray,TRUE); return ; @@ -229,15 +221,23 @@ int main (void) { - test_pointer_array_remove_range(); + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test array2-test Start"); + test_pointer_array_remove_range(); sort_pointer_array(); sort_pointer_array_with_data(); if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test array2-test Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test array2-test Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("array2-test"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/at-exit.c --- a/glib/tests/at-exit.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/at-exit.c Thu Oct 14 14:15:50 2010 +0530 @@ -18,28 +18,29 @@ #include #include -#define LOG_FILE "c:\\logs\\at_exit_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("at_exit_log"); - close_log_file(); -} +#include +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ void on_exit() { - std_log(LOG_FILENAME_LINE,"Test Successful"); - create_xml(0); + g_print("Test at_exit Successful"); + #if __SYMBIAN32__ + testResultXml("at-exit"); + #endif /* EMULATOR */ } int main (int argc, char *argv[]) { + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test at_exit Start"); g_atexit(on_exit); - std_log(LOG_FILENAME_LINE, "Test ll be considered failed if on_exit() is not called"); + g_print( "Test will be considered failed if on_exit() is not called"); return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/base-name.c --- a/glib/tests/base-name.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/base-name.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,25 +16,18 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include #include #include #include -#define LOG_FILE "c:\\logs\\base_name_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ #define MAX_FILENAME_LENGTH 256 #define MAX_PATH_LENGTH 256 -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("base_name_log"); - close_log_file(); -} - int main (int argc, char *argv[]) { char folder_name[] = "c:\\example\\test\\"; @@ -42,7 +35,13 @@ const gchar *ret_file_name; gchar input_file[MAX_PATH_LENGTH]; - sprintf(input_file, "%s%s", folder_name, file_name); + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test base-name Start"); + sprintf(input_file, "%s%s", folder_name, file_name); ret_file_name = g_basename(input_file); @@ -50,23 +49,25 @@ { if(g_strcmp0(ret_file_name, file_name) !=0 ) { - std_log(LOG_FILENAME_LINE, "g_basename returned wrong file name"); + g_print( "g_basename returned wrong file name"); assert_failed = 1; } } else { - std_log(LOG_FILENAME_LINE, "g_basename returned NULL. errno = %d", errno); + g_print( "g_basename returned NULL. errno = %d", errno); assert_failed = 1; } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test base-name Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test base-name Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("base-name"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/bookmarkfile-test1.c --- a/glib/tests/bookmarkfile-test1.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/bookmarkfile-test1.c Thu Oct 14 14:15:50 2010 +0530 @@ -14,23 +14,15 @@ // +#include #include #include -#define LOG_FILE "c:\\logs\\bookmark_test1_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ #define in_FILE "file.xbel" - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("bookmark-test1"); - close_log_file(); -} - int main (int argc, char *argv[]) @@ -44,46 +36,52 @@ const gchar *bookmark_filename = argv[1]; GError *error = NULL; gchar **bookmark_uri = NULL; - + + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test bookmarkfile-test1 Start"); bookmark = g_bookmark_file_new(); file_load= g_bookmark_file_load_from_file(bookmark, bookmark_filename, &error); if(file_load != TRUE) { - std_log(LOG_FILENAME_LINE,"g_bookmark_file_load_from_file fails with err:%s",error->message); + g_print("g_bookmark_file_load_from_file fails with err:%s",error->message); assert_failed = 1; } bookmark_data = g_bookmark_file_to_data(bookmark,&uris_len,&error); if(bookmark_data == NULL) { - std_log(LOG_FILENAME_LINE,"Bg_bookmark_file_to_data fails with err:%s",error->message); + g_print("Bg_bookmark_file_to_data fails with err:%s",error->message); assert_failed = 1; } rel_path = in_FILE; // Code changed to Hardcode the data file in the c:\ private path. file_written = g_bookmark_file_load_from_data_dirs(bookmark, rel_path,NULL, &error); if(file_written == FALSE) { - std_log(LOG_FILENAME_LINE,"g_bookmark_file_load_from_data_dirs fails with err:%s",error->message); + g_print("g_bookmark_file_load_from_data_dirs fails with err:%s",error->message); assert_failed = 1; } bookmark_uri = g_bookmark_file_get_uris(bookmark, NULL); if(bookmark_uri == NULL) { - std_log(LOG_FILENAME_LINE,"g_bookmark_file_get_uris fails"); + g_print("g_bookmark_file_get_uris fails"); assert_failed = 1; } bookmark_data = g_bookmark_file_get_mime_type(bookmark,*bookmark_uri,&error); if(bookmark_data == NULL) { - std_log(LOG_FILENAME_LINE,"URI cannot be found and the error code:%s",error->message); + g_print("URI cannot be found and the error code:%s",error->message); assert_failed = 1; } g_bookmark_file_set_is_private(bookmark,*bookmark_uri, TRUE); file_written = g_bookmark_file_get_is_private(bookmark,*bookmark_uri, &error); if(file_written == FALSE) { - std_log(LOG_FILENAME_LINE,"Private flag is not set in the URI and fails with :%s",error->message); + g_print("Private flag is not set in the URI and fails with :%s",error->message); assert_failed = 1; } @@ -91,18 +89,19 @@ time = g_bookmark_file_get_added(bookmark,*bookmark_uri,&error); if(time == -1) { - std_log(LOG_FILENAME_LINE,"URI cannot be found and fails with :%s",error->message); + g_print("URI cannot be found and fails with :%s",error->message); assert_failed = 1; } g_strfreev(bookmark_uri); g_bookmark_file_free(bookmark); if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Fail"); + g_print("Test bookmarkfile-test1 Fail"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); - + g_print("Test bookmarkfile-test1 Successful"); - create_xml(assert_failed); + #if __SYMBIAN32__ + testResultXml("bookmarkfile-test1"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/list-env.c --- a/glib/tests/list-env.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/list-env.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,20 +16,13 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include #include #include -#define LOG_FILE "c:\\logs\\list_env_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("list_env_log"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { @@ -41,7 +34,12 @@ gint i, found = 0; guint no_of_variables =0; gboolean found_var1 = 0, found_var2 = 0; - + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test list-env Start"); if(g_setenv (variable1, value1, TRUE) && g_setenv (variable2, value2, TRUE)) { env_list = g_listenv(); @@ -64,13 +62,13 @@ if(!(found_var1 && found_var2)) { - std_log(LOG_FILENAME_LINE, "g_listenv failed"); + g_print( "g_listenv failed"); assert_failed = 1; } } else { - std_log(LOG_FILENAME_LINE, "g_listenv returned list is of length 0"); + g_print( "g_listenv returned list is of length 0"); assert_failed = 1; } @@ -78,21 +76,23 @@ } else { - std_log(LOG_FILENAME_LINE, "g_listenv returned NULL"); + g_print( "g_listenv returned NULL"); assert_failed = 1; } } else { - std_log(LOG_FILENAME_LINE, "setting env variable failed. errno = %d", errno); + g_print( "setting env variable failed. errno = %d", errno); } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test list-env Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test list-env Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("list-env"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/majorversion-test.c --- a/glib/tests/majorversion-test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/majorversion-test.c Thu Oct 14 14:15:50 2010 +0530 @@ -17,21 +17,13 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN -#include +#include +#include #include "glib.h" -#define LOG_FILE "c:\\logs\\majorversion_test_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("version-test"); - close_log_file(); -} - +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, @@ -43,28 +35,35 @@ const guint *interface_age = NULL; const guint *binary_age = NULL; const gchar *check_version = NULL; + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test majorversion-test Start"); major_version = _glib_major_version(); minor_version = _glib_minor_version(); micro_version = _glib_micro_version(); interface_age = _glib_interface_age(); binary_age = _glib_binary_age(); - std_log(LOG_FILENAME_LINE,"Binary age :%d\n Interface age:%d",*binary_age,*interface_age); + g_print("Binary age :%d\n Interface age:%d",*binary_age,*interface_age); check_version = glib_check_version((*major_version),(*minor_version),(*micro_version)); if(check_version != NULL) { - std_log(LOG_FILENAME_LINE,"GLib library in use is not compatible with the given verison"); + g_print("GLib library in use is not compatible with the given verison"); assert_failed = 1; } if(assert_failed) { - std_log(LOG_FILENAME_LINE,"%s",check_version); - std_log(LOG_FILENAME_LINE,"Test Fail"); + g_print("%s",check_version); + g_print("Test majorversion-test Fail"); } else - std_log(LOG_FILENAME_LINE,"Test Successful"); - + g_print("Test majorversion-test Successful"); - create_xml(assert_failed); + #if __SYMBIAN32__ + testResultXml("majorversion-test"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/nullify-ptr.c --- a/glib/tests/nullify-ptr.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/nullify-ptr.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,37 +16,38 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include #include -#define LOG_FILE "c:\\logs\\nullify_ptr_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("nullify_ptr_log"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { char *ptr; - g_nullify_pointer((gpointer)&ptr); + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test nullify-ptr Start"); + g_nullify_pointer((gpointer)&ptr); if(ptr != NULL) { - std_log(LOG_FILENAME_LINE,"ptr is not NULL"); + g_print("ptr is not NULL"); assert_failed = 1; } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Fail"); + g_print("Test nullify-ptr Fail"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test nullify-ptr Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("nullify-ptr"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/slice-test.c --- a/glib/tests/slice-test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/slice-test.c Thu Oct 14 14:15:50 2010 +0530 @@ -17,6 +17,7 @@ * Boston, MA 02111-1307, USA. */ #include +#include #include #include diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/std_log_result.h --- a/glib/tests/std_log_result.h Wed Oct 13 19:39:18 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,178 +0,0 @@ -/* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* -*/ - - - -#ifndef _STD_LOG_FILE_H__ -#define _STD_LOG_FILE_H__ - -#include -#include -#include -#include -#include -#ifdef __SYMBIAN32__ -//#define LOG_FILE "c:\\logs\\std_test_log.txt" -#define LOG_DIR "c:\\logs\\" -#define LOG_FILE_EXT "xml" -int assert_failed = 0; -#else -#define LOG_DIR "" -#define LOG_FILE_EXT "xml" -#define LOG_FILE "std_test_log.txt" -int assert_failed = 0; -#endif -FILE *fp; - -int gnutest = 1; - -# define VERIFY(fn) gnutest &= (fn) - - -void std_log(const char *filename,const int lineno,const char* aformat,...) -{ - va_list va; - if(fp==NULL) - { - fp = fopen(LOG_FILE,"a"); - } - - va_start(va,aformat); - { - fprintf(fp,"%s - [%d] : ",filename,lineno); - vfprintf(fp,aformat,va); - fprintf(fp,"\n"); - } - va_end(va); - fflush(fp); -} - - -void init_log_file() -{ - if(fp == NULL) - { - fp = fopen(LOG_FILE, "a"); - } -} - -void close_log_file() -{ - fclose(fp); -} - -// This function is used to generate the xml file used bt ATS -void testResultXml(char *filename) -{ - char time_buf[50]; - - char result[10]; - - char xmlfilename[256]; - - time_t t = time(NULL); - - struct tm *tm1 = localtime(&t); - - char *atsinitmsg = "\n\t"; - - char *atsbatchinit1 = \ - "\n\t\t\ - \n\t\t\t\ - \n\t\t\t"; - - char *atsbatchinit2 = "\ - \n\t\t\tNA\ - \n\t\t\t\ - \n\t\t\t\tNA\ - \n\t\t\t\tNA\ - \n\t\t\t\ - \n\t\t"; - - char *atsbatchresult= \ - "\n\t\t\ - \n\t\t\t00:00:00\ - \n\t\t"; - - char *atsclosemsg = \ - "\n\t\ - \n\n "; - - char *atstestinit = "\n\t\t"; - - - char *atscaseinit1 = \ - "\n\t\t\t\ - \n\t\t\t\t\ - \n\t\t\t\t"; - - char *atscaseinit2 = "\ - \n\t\t\t\t0\ - \n\t\t\t"; - - char *atscaseresult1= \ - "\n\t\t\t\ - \n\t\t\t\t0\ - \n\t\t\t\t00:00:00\ - \n\t\t\t"; - - char *atstestclose = "\n\t\t"; - - /* Check and see if spd_logs/xml is existent or not. If not present create it */ - DIR *dir; - FILE *fp; - - dir = opendir("c:\\spd_logs"); - if(!dir) - mkdir("c:\\spd_logs",0777); - - dir = opendir("c:\\spd_logs\\xml"); - if(!dir) - mkdir("c:\\spd_logs\\xml",0777); - - // create the xml file name - strcpy(xmlfilename,"c:/spd_logs/xml/"); - strcat(xmlfilename,filename); - strcat(xmlfilename,".xml"); - - strftime(time_buf,50,"%c",tm1); - - if(assert_failed ) - strcpy(result,"FAILED"); - else - strcpy(result,"PASSED"); - - fp = fopen(xmlfilename,"w"); - - if(fp) - { - fprintf(fp,"%s%s%s%s%s%s%s%s%s%s%s%s%s%s",atsinitmsg,atsbatchinit1,time_buf,atsbatchinit2,atstestinit, - atscaseinit1,filename,atscaseinit2,atscaseresult1,result,atscaseresult2, - atstestclose,atsbatchresult,atsclosemsg); - - fclose(fp); - } - else - { - g_assert(FALSE && "Failed to create the xml file"); - } -} - -#endif - diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/test-utils.c --- a/glib/tests/test-utils.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/test-utils.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,20 +16,14 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include +#include #include #include -#define LOG_FILE "c:\\logs\\test_utils_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("test_utils_log"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ static void gstring_overwrite_int (GString *gstring, @@ -99,7 +93,7 @@ if(!g_test_trap_has_passed()) { - std_log(LOG_FILENAME_LINE, "g_test_trap_has_passed didnt work as expected"); + g_print( "g_test_trap_has_passed didnt work as expected"); assert_failed = 1; } } @@ -111,7 +105,7 @@ if(strcmp(ret, "message")) { - std_log(LOG_FILENAME_LINE, "g_test_log_type_name didnt work as expected"); + g_print( "g_test_log_type_name didnt work as expected"); assert_failed = 1; } } @@ -126,7 +120,7 @@ if(!(ret_time1 == ret_time2)) { - std_log(LOG_FILENAME_LINE, "g_test_timer* didnt work as expected"); + g_print( "g_test_timer* didnt work as expected"); assert_failed = 1; } } @@ -163,7 +157,7 @@ } else { - std_log(LOG_FILENAME_LINE, "g_test_log_buffer_pop returned NULL"); + g_print( "g_test_log_buffer_pop returned NULL"); assert_failed = 1; } @@ -171,7 +165,7 @@ } else { - std_log(LOG_FILENAME_LINE, "g_test_log_buffer_new returned NULL"); + g_print( "g_test_log_buffer_new returned NULL"); assert_failed = 1; } @@ -180,6 +174,12 @@ int main (int argc, char *argv[]) { + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + + g_print("Test test-utils Start"); g_test_init(&argc, &argv); test_g_test_trap(); @@ -188,11 +188,13 @@ test_g_log_buffer(); if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test test-utils Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test test-utils Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("test-utils"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/testglib.c --- a/glib/tests/testglib.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/testglib.c Thu Oct 14 14:15:50 2010 +0530 @@ -30,6 +30,7 @@ #include #include +#include #include #include "glib.h" diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/unichar-test.c --- a/glib/tests/unichar-test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/unichar-test.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,20 +16,13 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include #include #include -#define LOG_FILE "c:\\logs\\unichar_test_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("unichar_testlog"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { @@ -41,72 +34,78 @@ gunichar tel_symbol = 0x32C0; //telegraphic symbol for january gunichar CR = 0x000D; //carriage return GUnicodeBreakType type; + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + g_print("Test unichar-test Start"); g_unichar_get_mirror_char('(', &ret); if(!(')' == ret)) { - std_log(LOG_FILENAME_LINE,"g_unichar_get_mirror_char didnt work as expected"); + g_print("g_unichar_get_mirror_char didnt work as expected"); assert_failed = 1; } if(!g_unichar_ismark(mark)) { - std_log(LOG_FILENAME_LINE,"g_unichar_ismark didnt work as expected"); + g_print("g_unichar_ismark didnt work as expected"); assert_failed = 1; } if(!g_unichar_istitle(title)) { - std_log(LOG_FILENAME_LINE,"g_unichar_istitle didnt work as expected"); + g_print("g_unichar_istitle didnt work as expected"); assert_failed = 1; } if(!g_unichar_isdefined(square)) { - std_log(LOG_FILENAME_LINE,"g_unichar_isdefined didnt work as expected"); + g_print("g_unichar_isdefined didnt work as expected"); assert_failed = 1; } if(!g_unichar_iszerowidth(space)) { - std_log(LOG_FILENAME_LINE,"g_unichar_iszerowidth didnt work as expected"); + g_print("g_unichar_iszerowidth didnt work as expected"); assert_failed = 1; } if(!g_unichar_iswide(tel_symbol)) { - std_log(LOG_FILENAME_LINE,"g_unichar_iswide didnt work as expected"); + g_print("g_unichar_iswide didnt work as expected"); assert_failed = 1; } if(!g_unichar_iswide_cjk(tel_symbol)) { - std_log(LOG_FILENAME_LINE,"g_unichar_iswide_cjk didnt work as expected"); + g_print("g_unichar_iswide_cjk didnt work as expected"); assert_failed = 1; } ret = g_unichar_totitle('a'); if(!(ret == 'A')) { - std_log(LOG_FILENAME_LINE,"g_unichar_totitle didnt work as expected"); + g_print("g_unichar_totitle didnt work as expected"); assert_failed = 1; } type = g_unichar_break_type(CR); if(type != G_UNICODE_BREAK_CARRIAGE_RETURN) { - std_log(LOG_FILENAME_LINE,"g_unichar_break_type didnt work as expected"); + g_print("g_unichar_break_type didnt work as expected"); assert_failed = 1; } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test unichar-test Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test unichar-test Successful"); - create_xml(0); - + #if __SYMBIAN32__ + testResultXml("unichar-test"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/uri-funcs.c --- a/glib/tests/uri-funcs.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/uri-funcs.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,20 +16,14 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include +#include #include #include -#define LOG_FILE "c:\\logs\\uri_funcs_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("uri_funcs_log"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { @@ -38,21 +32,26 @@ char *p; char *q; char *escape_str; + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + g_print("Test uri-funcs Start"); p = g_uri_parse_scheme(uri); if(p) { if(strcmp(p, "http")) { - std_log(LOG_FILENAME_LINE,"g_uri_parse_scheme didnt work as expected"); + g_print("g_uri_parse_scheme didnt work as expected"); assert_failed = 1; } free(p); } else { - std_log(LOG_FILENAME_LINE,"g_uri_parse_scheme returnd NULL. errno = %d", errno); + g_print("g_uri_parse_scheme returnd NULL. errno = %d", errno); assert_failed = 1; } @@ -62,23 +61,23 @@ if(escape_str) { - std_log(LOG_FILENAME_LINE, "escape string %s", escape_str); + g_print( "escape string %s", escape_str); //convert back only a segment q = g_uri_unescape_segment(escape_str, escape_str+16, NULL); if(q) { - std_log(LOG_FILENAME_LINE, "unescape segment string %s", q); + g_print( "unescape segment string %s", q); if(strcmp(q, "http:\\\\www.no!")) { - std_log(LOG_FILENAME_LINE,"g_uri_unescape_segment didnt work as expected"); + g_print("g_uri_unescape_segment didnt work as expected"); assert_failed = 1; } free(q); } else { - std_log(LOG_FILENAME_LINE,"g_uri_unescape_segment returned NULL. errno = %d", errno); + g_print("g_uri_unescape_segment returned NULL. errno = %d", errno); assert_failed = 1; } @@ -86,12 +85,12 @@ p = g_uri_unescape_string(escape_str, NULL); if(p) { - std_log(LOG_FILENAME_LINE, "unescape string %s", p); + g_print( "unescape string %s", p); //converted string should be same as original uri string if(strcmp(p, uri)) { - std_log(LOG_FILENAME_LINE,"g_uri_unescape_string returned NULL"); + g_print("g_uri_unescape_string returned NULL"); assert_failed = 1; } @@ -99,7 +98,7 @@ } else { - std_log(LOG_FILENAME_LINE,"g_uri_unescape_string returned NULL. errno = %d", errno); + g_print("g_uri_unescape_string returned NULL. errno = %d", errno); assert_failed = 1; } @@ -107,16 +106,18 @@ } else { - std_log(LOG_FILENAME_LINE,"g_uri_escape_string returned NULL. errno = %d", errno); + g_print("g_uri_escape_string returned NULL. errno = %d", errno); assert_failed = 1; } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test uri-funcs Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test uri-funcs Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("uri-funcs"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tests/utf8-string.c --- a/glib/tests/utf8-string.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tests/utf8-string.c Thu Oct 14 14:15:50 2010 +0530 @@ -16,40 +16,38 @@ #undef G_DISABLE_ASSERT #undef G_LOG_DOMAIN +#include #include #include -#define LOG_FILE "c:\\logs\\utf8_string_log.txt" -#include "std_log_result.h" -#define LOG_FILENAME_LINE __FILE__, __LINE__ - -void create_xml(int result) -{ - if(result) - assert_failed = 1; - - testResultXml("utf8_string_log"); - close_log_file(); -} +#include +#ifdef __SYMBIAN32__ +#include "mrt2_glib2_test.h" +#endif /*__SYMBIAN32__*/ int main (int argc, char *argv[]) { gchar *src = "TestString"; gchar dest[20]; gchar *p; + #ifdef __SYMBIAN32__ + g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); + g_set_print_handler(mrtPrintHandler); + #endif /*__SYMBIAN32__*/ + g_print("Test utf8-string Start"); p = g_utf8_strncpy(dest, src, strlen(src)); if(p == dest) { if(strcmp(dest, src)) { - std_log(LOG_FILENAME_LINE,"g_utf8_strncpy didnt work as expected"); + g_print("g_utf8_strncpy didnt work as expected"); assert_failed = 1; } } else { - std_log(LOG_FILENAME_LINE,"g_utf8_strncpy's return value is invalid"); + g_print("g_utf8_strncpy's return value is invalid"); assert_failed = 1; } @@ -57,16 +55,18 @@ p = g_utf8_strrchr(src, strlen(src), 't'); if(strcmp(p, "tring")) { - std_log(LOG_FILENAME_LINE,"g_utf8_strrchr didnt work as expected"); + g_print("g_utf8_strrchr didnt work as expected"); assert_failed = 1; } if(assert_failed) - std_log(LOG_FILENAME_LINE,"Test Failed"); + g_print("Test utf8-string Failed"); else - std_log(LOG_FILENAME_LINE,"Test Successful"); + g_print("Test utf8-string Successful"); - create_xml(0); + #if __SYMBIAN32__ + testResultXml("utf8-string"); + #endif /* EMULATOR */ return 0; } diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/child-test1.mmp --- a/glib/tsrc/BC/group/child-test1.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/child-test1.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -31,9 +31,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/child-test2.mmp --- a/glib/tsrc/BC/group/child-test2.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/child-test2.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -32,9 +32,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/dir_test.mmp --- a/glib/tsrc/BC/group/dir_test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/dir_test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -16,7 +16,7 @@ */ -TARGET dirname_test.exe +TARGET dirnme_test.exe TARGETTYPE exe UID 0x1000008D 0xE1000005 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/env-test.mmp --- a/glib/tsrc/BC/group/env-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/env-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,8 +30,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../inc +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/file-test.mmp --- a/glib/tsrc/BC/group/file-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/file-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,8 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../tests +userinclude ../inc + SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/gio-test.mmp --- a/glib/tsrc/BC/group/gio-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/gio-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -31,9 +31,9 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../tests +//The src directory is added to the (user)include path by default + +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/hash-test.mmp --- a/glib/tsrc/BC/group/hash-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/hash-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/memchunks.mmp --- a/glib/tsrc/BC/group/memchunks.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/memchunks.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -31,8 +31,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../inc +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/node-test.mmp --- a/glib/tsrc/BC/group/node-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/node-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/queue-test.mmp --- a/glib/tsrc/BC/group/queue-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/queue-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,8 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +SYSTEMINCLUDE ../inc +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/testglib.mmp --- a/glib/tsrc/BC/group/testglib.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/testglib.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,7 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/sys diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/threadpool-test.mmp --- a/glib/tsrc/BC/group/threadpool-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/threadpool-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -30,9 +30,8 @@ VENDORID 0x00000000 #endif -SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +SYSTEMINCLUDE ../inc +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/sys diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/group/uri-test.mmp --- a/glib/tsrc/BC/group/uri-test.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/group/uri-test.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -32,8 +32,7 @@ #endif SYSTEMINCLUDE ../inc -SYSTEMINCLUDE ../../../inc -SYSTEMINCLUDE ../tests +userinclude ../inc SYSTEMINCLUDE /epoc32/include //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis //SYSTEMINCLUDE /epoc32/include/osextensions/stdapis/glib-2.0 diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/inc/config.h --- a/glib/tsrc/BC/inc/config.h Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/inc/config.h Thu Oct 14 14:15:50 2010 +0530 @@ -1,30 +1,21 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* Portions Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* Contributors: * -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Description: +* Description: * */ - - - +/* config.h.win32.in Merged from two versions generated by configure for gcc and MSVC. */ /* config.h. Generated by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ +/* define if asm blocks can use numeric local labels */ +/* #undef ASM_NUMERIC_LABELS */ + +/* poll doesn't work on devices */ +#define BROKEN_POLL 1 + /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. */ @@ -40,33 +31,36 @@ /* #undef ENABLE_GC_FRIENDLY_DEFAULT */ /* always defined to indicate that i18n is enabled */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define ENABLE_NLS 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define the gettext package to be used */ #define GETTEXT_PACKAGE "glib20" /* Define to the GLIB binary age */ -#define GLIB_BINARY_AGE 1003 +#define GLIB_BINARY_AGE 2100 /* Byte contents of gmutex */ #define GLIB_BYTE_CONTENTS_GMUTEX 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* Define to the GLIB interface age */ -#define GLIB_INTERFACE_AGE 3 +#define GLIB_INTERFACE_AGE 0 + +/* Define the location where the catalogs will be installed */ +#define GLIB_LOCALE_DIR "NONE/share/locale" /* Define to the GLIB major version */ #define GLIB_MAJOR_VERSION 2 /* Define to the GLIB micro version */ -#define GLIB_MICRO_VERSION 3 +#define GLIB_MICRO_VERSION 4 /* Define to the GLIB minor version */ -#define GLIB_MINOR_VERSION 10 +#define GLIB_MINOR_VERSION 20 /* The size of gmutex, as computed by sizeof. */ -#define GLIB_SIZEOF_GMUTEX 24 +/* #undef GLIB_SIZEOF_GMUTEX */ /* The size of system_thread, as computed by sizeof. */ #define GLIB_SIZEOF_SYSTEM_THREAD 4 @@ -74,6 +68,9 @@ /* alpha atomic implementation */ /* #undef G_ATOMIC_ALPHA */ +/* arm atomic implementation */ +/* #undef G_ATOMIC_ARM */ + /* i486 atomic implementation */ #define G_ATOMIC_I486 1 @@ -91,10 +88,7 @@ /* x86_64 atomic implementation */ /* #undef G_ATOMIC_X86_64 */ - -/* Whether glib was compiled with debugging enabled */ -#define G_COMPILED_WITH_DEBUGGING "minimum" - +#ifndef __SYMBIAN32__ /* Have inline keyword */ #define G_HAVE_INLINE 1 @@ -103,7 +97,7 @@ /* Have __inline__ keyword */ #define G_HAVE___INLINE__ 1 - +#endif//__SYMBIAN32__ /* Source file containing theread implementation */ #define G_THREAD_SOURCE "gthread-posix.c" @@ -114,23 +108,26 @@ /* #undef G_VA_COPY_AS_ARRAY */ /* Define to 1 if you have `alloca', as a function or macro. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_ALLOCA 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have and it should be used (not on Ultrix). */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_ALLOCA_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `atexit' function. */ #define HAVE_ATEXIT 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_ATTR_XATTR_H */ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_BIND_TEXTDOMAIN_CODESET 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define if you have a version of the snprintf function with semantics as specified by the ISO C99 standard. */ @@ -140,6 +137,15 @@ specified by the ISO C99 standard. */ #define HAVE_C99_VSNPRINTF 1 +/* define to 1 if Carbon is available */ +/* #undef HAVE_CARBON */ + +/* Define to 1 if you have the `chown' function. */ +/* #undef HAVE_CHOWN */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + /* Have nl_langinfo (CODESET) */ #define HAVE_CODESET 1 @@ -161,9 +167,33 @@ /* define for working do while(0) macros */ #define HAVE_DOWHILE_MACROS 1 +/* Define to 1 if you have the `endmntent' function. */ +/* #undef HAVE_ENDMNTENT */ + +/* Define if we have FAM */ +/* #undef HAVE_FAM */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FAM_H */ + +/* Define if we have FAMNoExists in fam */ +/* #undef HAVE_FAM_NO_EXISTS */ + +/* Define to 1 if you have the `fchmod' function. */ +#define HAVE_FCHMOD 1 + +/* Define to 1 if you have the `fchown' function. */ +/* #undef HAVE_FCHOWN */ + +/* Define to 1 if you have the `fdwalk' function. */ +/* #undef HAVE_FDWALK */ + /* Define to 1 if you have the header file. */ #define HAVE_FLOAT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_FSTAB_H */ + /* Define to 1 if you have the `getcwd' function. */ #define HAVE_GETCWD 1 @@ -173,12 +203,30 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 +/* Define to 1 if you have the `getmntent_r' function. */ +/* #undef HAVE_GETMNTENT_R */ + +/* Define to 1 if you have the `getmntinfo' function. */ +/* #undef HAVE_GETMNTINFO */ + +/* Define to 1 if you have the `getpwuid' function. */ +/* #undef HAVE_GETPWUID */ + /* Define if the GNU gettext() function is already present or preinstalled. */ #define HAVE_GETTEXT 1 +/* Define to 1 if you have the `gmtime_r' function. */ +#define HAVE_GMTIME_R 1 + /* define to use system printf */ #define HAVE_GOOD_PRINTF 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_GRP_H */ + +/* Define to 1 if you have the `hasmntopt' function. */ +/* #undef HAVE_HASMNTOPT */ + /* define to support printing 64-bit integers with format I64 */ /* #undef HAVE_INT64_AND_I64 */ @@ -204,6 +252,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_LIMITS_H 1 +/* Define to 1 if you have the `link' function. */ +#define HAVE_LINK 1 + /* Define to 1 if you have the header file. */ #define HAVE_LOCALE_H 1 @@ -223,14 +274,14 @@ #define HAVE_LSTAT 1 /* Define to 1 if you have the header file. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_MALLOC_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `memalign' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_MEMALIGN 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the `memmove' function. */ #define HAVE_MEMMOVE 1 @@ -253,21 +304,26 @@ /* Have non-POSIX function getpwuid_r */ /* #undef HAVE_NONPOSIX_GETPWUID_R */ +/* Define to 1 if you have the `nsleep' function. */ +/* #undef HAVE_NSLEEP */ + /* Define to 1 if you have the `on_exit' function. */ #define HAVE_ON_EXIT 1 /* Define to 1 if you have the `poll' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_POLL 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ +/* Have POSIX function getgrgid_r */ +/* #undef HAVE_POSIX_GETGRGID_R */ /* Have POSIX function getpwuid_r */ #define HAVE_POSIX_GETPWUID_R 1 /* Define to 1 if you have the `posix_memalign' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_POSIX_MEMALIGN 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Have function pthread_attr_setstacksize */ #define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1 @@ -284,15 +340,30 @@ /* Define to 1 if you have the header file. */ #define HAVE_SCHED_H 1 +/* Define to 1 if libselinux is available */ +/* #undef HAVE_SELINUX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SELINUX_SELINUX_H */ + /* Define to 1 if you have the `setenv' function. */ #define HAVE_SETENV 1 /* Define to 1 if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define to 1 if you have the `setmntent' function. */ +/* #undef HAVE_SETMNTENT */ + /* Define to 1 if you have the `snprintf' function. */ #define HAVE_SNPRINTF 1 +/* Define to 1 if you have the `statfs' function. */ +/* #undef HAVE_STATFS */ + +/* Define to 1 if you have the `statvfs' function. */ +/* #undef HAVE_STATVFS */ + /* Define to 1 if you have the header file. */ #define HAVE_STDDEF_H 1 @@ -328,29 +399,89 @@ #define HAVE_STRNCASECMP 1 /* Define to 1 if you have the `strsignal' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_STRSIGNAL 1 -#endif // !SYMBIAN +#endif // !__SYMBIAN32__ + +/* Define to 1 if you have the `strsignal' function. */ +/* #undef HAVE_STRSIGNAL */ + +/* Define to 1 if `f_bavail' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_BAVAIL */ + +/* Define to 1 if `f_fstypename' is member of `struct statfs'. */ +/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */ + +/* Define to 1 if `f_basetype' is member of `struct statvfs'. */ +/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */ + +/* Define to 1 if `st_atimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIMENSEC */ + +/* Define to 1 if `st_atim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC */ + +/* Define to 1 if `st_blksize' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BLKSIZE */ + +/* Define to 1 if `st_blocks' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_BLOCKS */ + +/* Define to 1 if `st_ctimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_CTIMENSEC */ + +/* Define to 1 if `st_ctim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_CTIM_TV_NSEC */ + +/* Define to 1 if `st_mtimensec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIMENSEC */ + +/* Define to 1 if `st_mtim.tv_nsec' is member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC */ /* Define to 1 if you have the `symlink' function. */ #define HAVE_SYMLINK 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_INOTIFY_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTCTL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MNTTAB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_MOUNT_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_PARAM_H 1 /* Define to 1 if you have the header file. */ #define HAVE_SYS_POLL_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_RESOURCE_H */ + /* found fd_set in sys/select.h */ #define HAVE_SYS_SELECT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_SYSCTL_H */ + /* Define to 1 if you have the header file. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_SYS_TIMES_H 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TIME_H 1 @@ -358,6 +489,15 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_TYPES_H 1 +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFSTAB_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VFS_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_VMOUNT_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_WAIT_H 1 @@ -371,10 +511,13 @@ /* Define to 1 if you have the `unsetenv' function. */ #define HAVE_UNSETENV 1 +/* Define to 1 if you have the `utimes' function. */ +#define HAVE_UTIMES 1 + /* Define to 1 if you have the `valloc' function. */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define HAVE_VALLOC 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Define to 1 if you have the header file. */ #define HAVE_VALUES_H 1 @@ -391,12 +534,21 @@ /* Define if you have the 'wchar_t' type. */ #define HAVE_WCHAR_T 1 +/* Define to 1 if you have the `wcslen' function. */ +#define HAVE_WCSLEN 1 + /* Define if you have the 'wint_t' type. */ #define HAVE_WINT_T 1 /* Have a working bcopy */ /* #undef HAVE_WORKING_BCOPY */ +/* Define to 1 if xattr is available */ +/* #undef HAVE_XATTR */ + +/* Define to 1 if xattr API uses XATTR_NOFOLLOW */ +/* #undef HAVE_XATTR_NOFOLLOW */ + /* Define to 1 if you have the `_NSGetEnviron' function. */ /* #undef HAVE__NSGETENVIRON */ @@ -406,14 +558,17 @@ /* didn't find fd_set */ /* #undef NO_FD_SET */ +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O */ + /* global 'sys_errlist' not found */ -/* #undef NO_SYS_ERRLIST */ +#define NO_SYS_ERRLIST 1 /* global 'sys_siglist' not found */ -/* #undef NO_SYS_SIGLIST */ +#define NO_SYS_SIGLIST 1 /* global 'sys_siglist' not declared */ -/* #undef NO_SYS_SIGLIST_DECL */ +#define NO_SYS_SIGLIST_DECL 1 /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=glib" @@ -422,21 +577,21 @@ #define PACKAGE_NAME "glib" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "glib 2.10.3" +#define PACKAGE_STRING "glib 2.20.4" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "glib" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.10.3" +#define PACKAGE_VERSION "2.20.4" /* Maximum POSIX RT priority */ #define POSIX_MAX_PRIORITY sched_get_priority_max(2) /* define if posix_memalign() can allocate any size */ -#ifndef SYMBIAN +#ifndef __SYMBIAN32__ #define POSIX_MEMALIGN_WITH_COMPLIANT_ALLOCS 1 -#endif /* SYMBIAN */ +#endif /* __SYMBIAN32__ */ /* Minimum POSIX RT priority */ #define POSIX_MIN_PRIORITY sched_get_priority_min(2) @@ -450,13 +605,13 @@ /* Define if you have correct malloc prototypes */ #define SANE_MALLOC_PROTOS 1 -/* The size of a `char', as computed by sizeof. */ +/* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 -/* The size of a `int', as computed by sizeof. */ +/* The size of `int', as computed by sizeof. */ #define SIZEOF_INT 4 -/* The size of a `long', as computed by sizeof. */ +/* The size of `long', as computed by sizeof. */ #define SIZEOF_LONG 4 /* The size of a `long long', as computed by sizeof. */ @@ -476,12 +631,15 @@ /* If using the C implementation of alloca, define if you know the direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. + automatically deduced at runtime. STACK_DIRECTION > 0 => grows toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ /* #undef STACK_DIRECTION */ +/* Number of arguments to statfs() */ +/* #undef STATFS_ARGS */ + /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 @@ -510,5 +668,18 @@ /* Define to empty if the C compiler doesn't support this keyword. */ /* #undef signed */ -/* Define to `unsigned' if does not define. */ +/* Define to `unsigned int' if does not define. */ /* #undef size_t */ + +#define LINK_SIZE 2 +#define NEWLINE -1 +#define MATCH_LIMIT 10000000 +#define MATCH_LIMIT_RECURSION 8192 +#define MAX_NAME_SIZE 32 +#define MAX_NAME_COUNT 10000 +#define POSIX_MALLOC_THRESHOLD 10 +//define SUPPORT_UTF8 here so that pcre is build with UTF8 support +#define SUPPORT_UTF8 1 +//define SUPPORT_UCP here so that pcre is build with UTF8 properties support +#define SUPPORT_UCP 1 + diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/inc/gmoduleconf.h --- a/glib/tsrc/BC/inc/gmoduleconf.h Wed Oct 13 19:39:18 2010 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* GMODULE - GLIB wrapper code for dynamic module loading - * Copyright (C) 1998 Tim Janik - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ -#ifndef __G_MODULE_CONF_H__ -#define __G_MODULE_CONF_H__ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define G_MODULE_IMPL_NONE 0 -#define G_MODULE_IMPL_DL 1 -#define G_MODULE_IMPL_DLD 2 -#define G_MODULE_IMPL_WIN32 3 -#define G_MODULE_IMPL_OS2 4 -#define G_MODULE_IMPL_BEOS 5 -#define G_MODULE_IMPL_DYLD 6 -#define G_MODULE_IMPL_AR 7 - -#define G_MODULE_IMPL G_MODULE_IMPL_DL -#undef G_MODULE_HAVE_DLERROR -#if (1) -#define G_MODULE_HAVE_DLERROR -#endif -#if (0) || defined (hp9000s300) || defined (__hp9000s300) || defined (__hp9000s300__) -#define G_MODULE_NEED_USCORE -#endif -#if (0) -#define G_MODULE_BROKEN_RTLD_GLOBAL -#endif - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __G_MODULE_CONF_H__ */ diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/sis/glibt.bat --- a/glib/tsrc/BC/sis/glibt.bat Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/sis/glibt.bat Thu Oct 14 14:15:50 2010 +0530 @@ -35,7 +35,7 @@ convert-test.exe date-test.exe defaultiface.exe -dirname-test.exe +dirnme-test.exe env-test.exe extra_tests.exe gio-test.exe diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/sis/s4_OsSrv_glib.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/glib/tsrc/BC/sis/s4_OsSrv_glib.pkg Thu Oct 14 14:15:50 2010 +0530 @@ -0,0 +1,156 @@ +; ============================================================================ +; Name : openc_glib.pkg +; Part of : openc project +; Description : package file for glib libraries +; +; Version : 1.0 +; +; Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +; +; This library is free software; you can redistribute it and/or +; modify it under the terms of the GNU Lesser General Public +; License as published by the Free Software Foundation; either +; version 2 of the License, or (at your option) any later version. +; +; This library is distributed in the hope that it will be useful, +; but WITHOUT ANY WARRANTY; without even the implied warranty of +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +; Lesser General Public License for more details. +; +; You should have received a copy of the GNU Lesser General Public +; License along with this library; if not, write to the +; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +; Boston, MA 02111-1307, USA. + +;Languages +&EN + +;Header +#{"Open C_Glib_TestApp"},(0x10281F2D),1,0,0 + +;Supports S60 3.0 +[0x101F7961],3,*,*,{"Series60ProductID"} + +;Localised Vendor name +%{"Nokia"} + +;Unique Vendor name +:"Nokia" + +;Files to install + +"\epoc32\winscw\c\temp\tmp\test.txt"-"!:\test.txt" +"\epoc32\winscw\c\temp\tmp\test.txt"-"!:\temp\tmp\test.txt" +"\epoc32\winscw\c\1.gmarkup"-"!:\1.gmarkup" +"\epoc32\winscw\c\iochannel-test-infile"-"!:\iochannel-test-infile" +"\epoc32\winscw\c\casemap.bin"-"!:\casemap.bin" +"\epoc32\winscw\c\casefold.bin"-"!:\casefold.bin" +"\epoc32\winscw\c\utf8.txt"-"!:\utf8.txt" +"\epoc32\winscw\c\casecollate.txt"-"!:\casecollate.txt" +"\epoc32\winscw\c\utf8_hindi.txt"-"!:\utf8_hindi.txt" +"\epoc32\winscw\c\scanfile.txt"-"!:\scanfile.txt" +"\epoc32\winscw\c\NormalizationTest.txt"-"!:\NormalizationTest.txt" +"\epoc32\release\armv5\urel\accumulator.exe"-"c:\sys\bin\accumulator.exe" +"\epoc32\release\armv5\urel\array-test.exe"-"c:\sys\bin\array-test.exe" +"\epoc32\release\armv5\urel\asyncqueue-test.exe"-"c:\sys\bin\asyncqueue-test.exe" +"\epoc32\release\armv5\urel\atomic-test.exe"-"c:\sys\bin\atomic-test.exe" +"\epoc32\release\armv5\urel\child-test1.exe"-"c:\sys\bin\child-test1.exe" + +"\epoc32\release\armv5\urel\child-test2.exe"-"c:\sys\bin\child-test2.exe" +"\epoc32\release\armv5\urel\closure-marshal.exe"-"c:\sys\bin\closure-marshal.exe" +"\epoc32\release\armv5\urel\closures.exe"-"c:\sys\bin\closures.exe" + +"\epoc32\release\armv5\urel\completion-test.exe"-"c:\sys\bin\completion-test.exe" +"\epoc32\release\armv5\urel\convert-test.exe"-"c:\sys\bin\convert-test.exe" +"\epoc32\release\armv5\urel\date-test.exe"-"c:\sys\bin\date-test.exe" + +"\epoc32\release\armv5\urel\defaultiface.exe"-"c:\sys\bin\defaultiface.exe" +"\epoc32\release\armv5\urel\dirname-test.exe"-"c:\sys\bin\dirname-test.exe" +"\epoc32\release\armv5\urel\env-test.exe"-"c:\sys\bin\env-test.exe" + +"\epoc32\release\armv5\urel\error_check_mutexes.exe"-"c:\sys\bin\error_check_mutexes.exe" +"\epoc32\release\armv5\urel\extra_tests.exe"-"c:\sys\bin\extra_tests.exe" +"\epoc32\release\armv5\urel\file-test.exe"-"c:\sys\bin\file-test.exe" + +"\epoc32\release\armv5\urel\gio-test.exe"-"c:\sys\bin\gio-test.exe" +"\epoc32\release\armv5\urel\gvalue-test.exe"-"c:\sys\bin\gvalue-test.exe" +"\epoc32\release\armv5\urel\g_test1.exe"-"c:\sys\bin\g_test1.exe" +"\epoc32\release\armv5\urel\g_test2.exe"-"c:\sys\bin\g_test2.exe" +"\epoc32\release\armv5\urel\hash-test.exe"-"c:\sys\bin\hash-test.exe" +"\epoc32\release\armv5\urel\ifacecheck.exe"-"c:\sys\bin\ifacecheck.exe" +"\epoc32\release\armv5\urel\ifaceinherit.exe"-"c:\sys\bin\ifaceinherit.exe" +"\epoc32\release\armv5\urel\ifaceinit.exe"-"c:\sys\bin\ifaceinit.exe" +"\epoc32\release\armv5\urel\ifaceproperties.exe"-"c:\sys\bin\ifaceproperties.exe" +"\epoc32\release\armv5\urel\iochannel-test.exe"-"c:\sys\bin\iochannel-test.exe" +"\epoc32\release\armv5\urel\keyfile-test.exe"-"c:\sys\bin\keyfile-test.exe" +"\epoc32\release\armv5\urel\list-test.exe"-"c:\sys\bin\list-test.exe" +"\epoc32\release\armv5\urel\mainloop-test.exe"-"c:\sys\bin\mainloop-test.exe" +"\epoc32\release\armv5\urel\mapping-test.exe"-"c:\sys\bin\mapping-test.exe" +"\epoc32\release\armv5\urel\markup-escape-test.exe"-"c:\sys\bin\markup-escape-test.exe" +"\epoc32\release\armv5\urel\markup-test.exe"-"c:\sys\bin\markup-test.exe" +"\epoc32\release\armv5\urel\module-test.exe"-"c:\sys\bin\module-test.exe" +"\epoc32\release\armv5\urel\node-test.exe"-"c:\sys\bin\node-test.exe" +"\epoc32\release\armv5\urel\objects.exe"-"c:\sys\bin\objects.exe" +"\epoc32\release\armv5\urel\objects2.exe"-"c:\sys\bin\objects2.exe" +"\epoc32\release\armv5\urel\option-test.exe"-"c:\sys\bin\option-test.exe" +"\epoc32\release\armv5\urel\override.exe"-"c:\sys\bin\override.exe" +"\epoc32\release\armv5\urel\paramspec-test.exe"-"c:\sys\bin\paramspec-test.exe" +"\epoc32\release\armv5\urel\patterntest.exe"-"c:\sys\bin\patterntest.exe" +"\epoc32\release\armv5\urel\printf-test.exe"-"c:\sys\bin\printf-test.exe" +"\epoc32\release\armv5\urel\properties.exe"-"c:\sys\bin\properties.exe" +"\epoc32\release\armv5\urel\properties2.exe"-"c:\sys\bin\properties2.exe" +"\epoc32\release\armv5\urel\qsort-test.exe"-"c:\sys\bin\qsort-test.exe" +"\epoc32\release\armv5\urel\queue-test.exe"-"c:\sys\bin\queue-test.exe" +"\epoc32\release\armv5\urel\rand-test.exe"-"c:\sys\bin\rand-test.exe" +"\epoc32\release\armv5\urel\references.exe"-"c:\sys\bin\references.exe" +"\epoc32\release\armv5\urel\relation-test.exe"-"c:\sys\bin\relation-test.exe" +"\epoc32\release\armv5\urel\shell-test.exe"-"c:\sys\bin\shell-test.exe" +"\epoc32\release\armv5\urel\signals-multithread.exe"-"c:\sys\bin\signals-multithread.exe" +"\epoc32\release\armv5\urel\signals-singlethread.exe"-"c:\sys\bin\signals-singlethread.exe" +"\epoc32\release\armv5\urel\slist-test.exe"-"c:\sys\bin\slist-test.exe" +"\epoc32\release\armv5\urel\strfunc-test.exe"-"c:\sys\bin\strfunc-test.exe" +"\epoc32\release\armv5\urel\string-test.exe"-"c:\sys\bin\string-test.exe" +"\epoc32\release\armv5\urel\strtod-test.exe"-"c:\sys\bin\strtod-test.exe" +"\epoc32\release\armv5\urel\tasyncqueue.exe"-"c:\sys\bin\tasyncqueue.exe" +"\epoc32\release\armv5\urel\testgdate.exe"-"c:\sys\bin\testgdate.exe" +"\epoc32\release\armv5\urel\testgdateparser.exe"-"c:\sys\bin\testgdateparser.exe" +"\epoc32\release\armv5\urel\testglib.exe"-"c:\sys\bin\testglib.exe" +"\epoc32\release\armv5\urel\testgobject.exe"-"c:\sys\bin\testgobject.exe" +"\epoc32\release\armv5\urel\tgstring.exe"-"c:\sys\bin\tgstring.exe" +"\epoc32\release\armv5\urel\thread-test.exe"-"c:\sys\bin\thread-test.exe" +"\epoc32\release\armv5\urel\threadpool-test.exe"-"c:\sys\bin\threadpool-test.exe" +"\epoc32\release\armv5\urel\timeloop-closure.exe"-"c:\sys\bin\timeloop-closure.exe" +"\epoc32\release\armv5\urel\timeloop.exe"-"c:\sys\bin\timeloop.exe" +"\epoc32\release\armv5\urel\tmanual.exe"-"c:\sys\bin\tmanual.exe" +"\epoc32\release\armv5\urel\tmisc.exe"-"c:\sys\bin\tmisc.exe" +"\epoc32\release\armv5\urel\tnode.exe"-"c:\sys\bin\tnode.exe" +"\epoc32\release\armv5\urel\toption.exe"-"c:\sys\bin\toption.exe" +"\epoc32\release\armv5\urel\tree1-test.exe"-"c:\sys\bin\tree-test.exe" +"\epoc32\release\armv5\urel\tscanner.exe"-"c:\sys\bin\tscanner.exe" +"\epoc32\release\armv5\urel\tslist.exe"-"c:\sys\bin\tslist.exe" +"\epoc32\release\armv5\urel\tthread.exe"-"c:\sys\bin\tthread.exe" +"\epoc32\release\armv5\urel\ttrash.exe"-"c:\sys\bin\ttrash.exe" +"\epoc32\release\armv5\urel\ttree.exe"-"c:\sys\bin\ttree.exe" +"\epoc32\release\armv5\urel\tunichar.exe"-"c:\sys\bin\tunichar.exe" +"\epoc32\release\armv5\urel\tutf8.exe"-"c:\sys\bin\tutf8.exe" +"\epoc32\release\armv5\urel\typetest.exe"-"c:\sys\bin\typetest.exe" +"\epoc32\release\armv5\urel\unichar_test.exe"-"c:\sys\bin\unichar_test.exe" +"\epoc32\release\armv5\urel\unicode-caseconv.exe"-"c:\sys\bin\unicode-caseconv.exe" +"\epoc32\release\armv5\urel\unicode-collate.exe"-"c:\sys\bin\unicode-collate.exe" +"\epoc32\release\armv5\urel\unicode-encoding.exe"-"c:\sys\bin\unicode-encoding.exe" +"\epoc32\release\armv5\urel\unicode-normalize.exe"-"c:\sys\bin\unicode-normalize.exe" +"\epoc32\release\armv5\urel\uri-test.exe"-"c:\sys\bin\uri-test.exe" +"\epoc32\release\armv5\urel\utf8-pointer.exe"-"c:\sys\bin\utf8-pointer.exe" +"\epoc32\release\armv5\urel\utf8-validate.exe"-"c:\sys\bin\utf8-validate.exe" +"\epoc32\release\armv5\urel\libmoduletestplugin_a.dll"-"c:\sys\bin\libmoduletestplugin_a.dll" +"\epoc32\release\armv5\urel\libmoduletestplugin_b.dll"-"c:\sys\bin\libmoduletestplugin_b.dll" +"AutoExec.bat"-"F:\AutoExec.bat" + + + + +"glibT.bat"-"!:\glibT.bat" + + +; Depends on openc_stdlibs being installed +;(0x10207369), 1, 0, 0, {"Open C Standard Libraries"} diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/sis/s4_OsSrv_glib.sis Binary file glib/tsrc/BC/sis/s4_OsSrv_glib.sis has changed diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/src/dir_test.c --- a/glib/tsrc/BC/src/dir_test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/src/dir_test.c Thu Oct 14 14:15:50 2010 +0530 @@ -26,11 +26,11 @@ #undef G_LOG_DOMAIN #include -#include #include #include #include "glib.h" #include +#include #ifdef SYMBIAN #include "mrt2_glib2_test.h" #endif /*SYMBIAN*/ @@ -59,7 +59,7 @@ g_dir_close(dir); #if SYMBIAN - testResultXml("dirname_test"); + testResultXml("dirnme_test"); #endif /* EMULATOR */ rmdir("c:\\temp\\tmp"); diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/src/object_extra_tests.c --- a/glib/tsrc/BC/src/object_extra_tests.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/src/object_extra_tests.c Thu Oct 14 14:15:50 2010 +0530 @@ -60,7 +60,7 @@ static GType g_test_get_type (void); static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); +//static void g_test_init (GTest * test); static void g_test_dispose (GObject * object); static void g_test_get_property (GObject *object, guint prop_id, @@ -133,13 +133,13 @@ G_PARAM_READWRITE)); } - +/* static void g_test_init (GTest * test) { //g_print ("init %p\n", test); } - +*/ static void g_test_dispose (GObject * object) { diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/file-test.c --- a/glib/tsrc/BC/tests/file-test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/file-test.c Thu Oct 14 14:15:50 2010 +0530 @@ -47,7 +47,7 @@ #include /* For read(), write() etc */ #endif -#ifdef SYMBIAN +#ifdef __SYMBIAN32__ #include "mrt2_glib2_test.h" #endif /*SYMBIAN*/ @@ -173,7 +173,7 @@ int main (int argc, char *argv[]) { - #ifdef SYMBIAN + #ifdef __SYMBIAN__ g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); g_set_print_handler(mrtPrintHandler); #endif /*SYMBIAN*/ @@ -183,7 +183,7 @@ test_readlink (); test_get_contents (); - #if SYMBIAN + #ifdef __SYMBIAN__ testResultXml("file-test"); #endif /* EMULATOR */ diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/mainloop-test.c --- a/glib/tsrc/BC/tests/mainloop-test.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/mainloop-test.c Thu Oct 14 14:15:50 2010 +0530 @@ -5,6 +5,7 @@ #include #include +#include #ifdef G_OS_UNIX #include diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/closures.c --- a/glib/tsrc/BC/tests/refcount/closures.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/closures.c Thu Oct 14 14:15:50 2010 +0530 @@ -45,14 +45,14 @@ void (*test_signal3) (GTest * test, gint an_int); } GTestClass; -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) -G_DEFINE_TYPE (GTest, g_test, G_TYPE_OBJECT); +G_DEFINE_TYPE (GTest, my_test, G_TYPE_OBJECT); /* --- variables --- */ static volatile gboolean stopping = FALSE; @@ -69,7 +69,7 @@ /* --- functions --- */ static void -g_test_init (GTest * test) +my_test_init (GTest * test) { //g_print ("init %p\n", test); @@ -84,12 +84,12 @@ }; static void -g_test_set_property (GObject *object, +my_test_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - GTest *test = G_TEST (object); + GTest *test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -102,12 +102,12 @@ } static void -g_test_get_property (GObject *object, +my_test_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - GTest *test = G_TEST (object); + GTest *test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -120,38 +120,38 @@ } static void -g_test_test_signal2 (GTest *test, - gint an_int) +my_test_test_signal2 (GTest *test, + gint an_int) { } static void -g_test_emit_test_signal1 (GTest *test, - gint vint) +my_test_emit_test_signal1 (GTest *test, + gint vint) { g_signal_emit (G_OBJECT (test), test_signal1, 0, vint); } static void -g_test_emit_test_signal2 (GTest *test, - gint vint) +my_test_emit_test_signal2 (GTest *test, + gint vint) { g_signal_emit (G_OBJECT (test), test_signal2, 0, vint); } static void -g_test_emit_test_signal3 (GTest *test, +my_test_emit_test_signal3 (GTest *test, gint vint) { g_signal_emit (G_OBJECT (test), test_signal3, 0, vint); } static void -g_test_class_init (GTestClass *klass) +my_test_class_init (GTestClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - gobject_class->set_property = g_test_set_property; - gobject_class->get_property = g_test_get_property; + gobject_class->set_property = my_test_set_property; + gobject_class->get_property = my_test_get_property; test_signal1 = g_signal_new ("test-signal1", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal1), NULL, NULL, @@ -168,8 +168,8 @@ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_TEST_PROP, g_param_spec_int ("test-prop", "Test Prop", "Test property", 0, 1, 0, G_PARAM_READWRITE)); - klass->test_signal2 = g_test_test_signal2; - klass->test_signal3 = g_test_test_signal2; + klass->test_signal2 = my_test_test_signal2; + klass->test_signal3 = my_test_test_signal2; } static inline guint32 @@ -266,9 +266,9 @@ static void test_emissions (GTest *test) { - g_test_emit_test_signal1 (test, TEST_INT1); - g_test_emit_test_signal2 (test, TEST_INT2); - g_test_emit_test_signal3 (test, TEST_INT3); + my_test_emit_test_signal1 (test, TEST_INT1); + my_test_emit_test_signal2 (test, TEST_INT2); + my_test_emit_test_signal3 (test, TEST_INT3); } int @@ -280,11 +280,10 @@ GTest *object; guint i; - #ifdef SYMBIAN + #ifdef __SYMBIAN32__ g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); g_set_print_handler(mrtPrintHandler); - #endif /*SYMBIAN*/ - + #endif /*__SYMBIAN32__*/ g_thread_init (NULL); //g_print ("START: %s\n", argv[0]); diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/objects.c --- a/glib/tsrc/BC/tests/refcount/objects.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/objects.c Thu Oct 14 14:15:50 2010 +0530 @@ -11,12 +11,12 @@ -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) typedef struct _GTest GTest; typedef struct _GTestClass GTestClass; @@ -31,17 +31,17 @@ GObjectClass parent_class; }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); static volatile gboolean stopping; -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); static GObjectClass *parent_class = NULL; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -50,12 +50,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -66,7 +66,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; @@ -74,21 +74,21 @@ parent_class = g_type_class_ref (G_TYPE_OBJECT); - gobject_class->dispose = g_test_dispose; + gobject_class->dispose = my_test_dispose; } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { //g_print ("init %p\n", test); } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); //g_print ("dispose %p!\n", object); @@ -96,7 +96,7 @@ } static void -g_test_do_refcount (GTest * test) +my_test_do_refcount (GTest * test) { g_object_ref (test); g_object_unref (test); @@ -108,7 +108,7 @@ gint i = 1; while (!stopping) { - g_test_do_refcount (test); + my_test_do_refcount (test); if ((i++ % 10000) == 0) { //g_print ("."); g_thread_yield(); /* force context switch */ diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/objects2.c --- a/glib/tsrc/BC/tests/refcount/objects2.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/objects2.c Thu Oct 14 14:15:50 2010 +0530 @@ -1,4 +1,6 @@ -/* Portion Copyright © 2008-09 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. */ +/* +* Portions copyright (c) 2006-2009 Nokia Corporation. All rights reserved. +*/ #include #include #include @@ -10,12 +12,12 @@ -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) typedef struct _GTest GTest; typedef struct _GTestClass GTestClass; @@ -30,16 +32,16 @@ GObjectClass parent_class; }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); static GObjectClass *parent_class = NULL; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -48,12 +50,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -64,7 +66,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; @@ -72,21 +74,21 @@ parent_class = g_type_class_ref (G_TYPE_OBJECT); - gobject_class->dispose = g_test_dispose; + gobject_class->dispose = my_test_dispose; } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { //g_print ("init %p\n", test); } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); //g_print ("dispose %p!\n", object); @@ -94,7 +96,7 @@ } static void -g_test_do_refcount (GTest * test) +my_test_do_refcount (GTest * test) { static guint i = 1; if (i++ % 100 == 0); @@ -126,7 +128,7 @@ g_assert(test != NULL); for (i=0; i<1000; i++) { - g_test_do_refcount (test); + my_test_do_refcount (test); } //g_print ("\n"); diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/properties.c --- a/glib/tsrc/BC/tests/refcount/properties.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/properties.c Thu Oct 14 14:15:50 2010 +0530 @@ -12,12 +12,12 @@ -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) enum { PROP_0, @@ -41,25 +41,25 @@ GObjectClass parent_class; }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); static volatile gboolean stopping; -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); -static void g_test_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void g_test_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); +static void my_test_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void my_test_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); static GObjectClass *parent_class = NULL; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -68,12 +68,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -83,7 +83,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; @@ -91,9 +91,9 @@ parent_class = g_type_class_ref (G_TYPE_OBJECT); - gobject_class->dispose = g_test_dispose; - gobject_class->get_property = g_test_get_property; - gobject_class->set_property = g_test_set_property; + gobject_class->dispose = my_test_dispose; + gobject_class->get_property = my_test_get_property; + gobject_class->set_property = my_test_set_property; g_object_class_install_property (gobject_class, PROP_DUMMY, @@ -105,31 +105,31 @@ } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { static guint static_id = 1; test->id = static_id++; } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); G_OBJECT_CLASS (parent_class)->dispose (object); } static void -g_test_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +my_test_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { @@ -143,14 +143,14 @@ } static void -g_test_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +my_test_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { @@ -169,13 +169,13 @@ { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); test->count++; } static void -g_test_do_property (GTest * test) +my_test_do_property (GTest * test) { gint dummy; @@ -189,7 +189,7 @@ gint i = 1; while (!stopping) { - g_test_do_property (test); + my_test_do_property (test); if ((i++ % 10000) == 0) { g_print (".%c", 'a' + test->id); @@ -212,9 +212,7 @@ g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); g_set_print_handler(mrtPrintHandler); - #endif /*SYMBIAN*/ - - + #endif /*__SYMBIAN32__*/ g_thread_init (NULL); //g_print ("START: %s\n", argv[0]); g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal (G_LOG_FATAL_MASK)); diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/properties2.c --- a/glib/tsrc/BC/tests/refcount/properties2.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/properties2.c Thu Oct 14 14:15:50 2010 +0530 @@ -9,12 +9,12 @@ #endif /*SYMBIAN*/ -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) enum { PROP_0, @@ -36,24 +36,24 @@ GObjectClass parent_class; }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); -static void g_test_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec); -static void g_test_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); +static void my_test_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec); +static void my_test_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec); static GObjectClass *parent_class = NULL; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -62,12 +62,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -83,7 +83,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; GParamSpec *gparam_spec; @@ -99,9 +99,9 @@ - gobject_class->dispose = g_test_dispose; - gobject_class->get_property = g_test_get_property; - gobject_class->set_property = g_test_set_property; + gobject_class->dispose = my_test_dispose; + gobject_class->get_property = my_test_get_property; + gobject_class->set_property = my_test_set_property; g_object_class_install_property (gobject_class, PROP_DUMMY, @@ -110,21 +110,20 @@ NULL, 0, G_MAXINT, 0, G_PARAM_READWRITE)); - } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { //g_print ("init %p\n", test); } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); g_print ("dispose %p!\n", object); @@ -132,14 +131,14 @@ } static void -g_test_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +my_test_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { @@ -153,14 +152,14 @@ } static void -g_test_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +my_test_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { @@ -185,7 +184,7 @@ } static void -g_test_do_property (GTest * test) +my_test_do_property (GTest * test) { gint dummy; @@ -225,7 +224,7 @@ g_assert (count == test->dummy); for (i=0; i<1000; i++) { - g_test_do_property (test); + my_test_do_property (test); } g_assert (count == test->dummy); diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/signals-multithread.c --- a/glib/tsrc/BC/tests/refcount/signals-multithread.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/signals-multithread.c Thu Oct 14 14:15:50 2010 +0530 @@ -23,13 +23,12 @@ guint gi; #endif /*SYMBIAN*/ - -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) static GRand *grand; @@ -51,7 +50,7 @@ void (*test_signal2) (GTest * test, gint an_int); }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); static volatile gboolean stopping; /* Element signals and args */ @@ -69,23 +68,23 @@ ARG_TEST_PROP }; -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); static void signal2_handler (GTest * test, gint anint); -static void g_test_set_property (GObject * object, guint prop_id, +static void my_test_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void g_test_get_property (GObject * object, guint prop_id, +static void my_test_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static GObjectClass *parent_class = NULL; -static guint g_test_signals[LAST_SIGNAL] = { 0 }; +static guint my_test_signals[LAST_SIGNAL] = { 0 }; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -94,12 +93,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -112,7 +111,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; @@ -130,16 +129,15 @@ #endif /*MULTITHREAD*/ #endif /*SYMBAIN*/ + gobject_class->dispose = my_test_dispose; + gobject_class->set_property = my_test_set_property; + gobject_class->get_property = my_test_get_property; - gobject_class->dispose = g_test_dispose; - gobject_class->set_property = g_test_set_property; - gobject_class->get_property = g_test_get_property; - - g_test_signals[TEST_SIGNAL1] = + my_test_signals[TEST_SIGNAL1] = g_signal_new ("test-signal1", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal1), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - g_test_signals[TEST_SIGNAL2] = + my_test_signals[TEST_SIGNAL2] = g_signal_new ("test-signal2", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal2), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); @@ -152,7 +150,7 @@ } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { #ifndef SYMBIAN g_print ("init %p\n", test); @@ -168,11 +166,11 @@ } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); g_print ("dispose %p!\n", object); @@ -180,12 +178,12 @@ } static void -g_test_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) +my_test_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -198,12 +196,12 @@ } static void -g_test_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) +my_test_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -216,9 +214,9 @@ } static void -g_test_do_signal1 (GTest * test) +my_test_do_signal1 (GTest * test) { - g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL1], 0, 0); + g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL1], 0, 0); } static void @@ -232,13 +230,13 @@ } static void -g_test_do_signal2 (GTest * test) +my_test_do_signal2 (GTest * test) { - g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL2], 0, 0); + g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL2], 0, 0); } static void -g_test_do_prop (GTest * test) +my_test_do_prop (GTest * test) { test->value = g_rand_int (grand); g_object_notify (G_OBJECT (test), "test-prop"); @@ -253,14 +251,14 @@ while (!stopping) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); if ((i++ % 10000) == 0) { g_print ("."); - g_thread_yield(); /*force context switch */ + g_thread_yield(); /* force context switch */ } } #else @@ -269,11 +267,11 @@ while (!stopping) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); if ((i++ % 10/*000*/) == 0) { #ifdef VERBOSE @@ -286,11 +284,11 @@ for(i=0;i <= LOOP;i++) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); #ifdef VERBOSE g_print("."); @@ -303,9 +301,6 @@ return NULL; } - - - static void notify (GObject *object, GParamSpec *spec, gpointer user_data) { @@ -317,7 +312,7 @@ #endif g_object_get (object, "test-prop", &value, NULL); - //g_print ("+ %d", value); + /*g_print ("+ %d", value);*/ } #ifdef SYMBIAN @@ -341,7 +336,7 @@ #ifdef SYMBIAN g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); g_set_print_handler(mrtPrintHandler); - #endif /*SYMBIAN*/ + #endif /*__SYMBIAN32__*/ g_thread_init (NULL); @@ -624,8 +619,8 @@ handlernum=0; -g_signal_emit(G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0); -g_signal_emit(G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit(G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit(G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0); g_assert(handlernum==2); @@ -636,8 +631,8 @@ #endif handlernum=0; -g_signal_emit (G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0); -g_signal_emit (G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit (G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit (G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0); g_assert(handlernum==0); g_assert (strcmp ("test-signal1", g_signal_name (g_signal_lookup("test-signal1",G_TYPE_TEST))) == 0); @@ -653,7 +648,7 @@ g_assert(g_signal_lookup("test-signal1",G_TYPE_TEST)==gi); notifynum=0; -g_signal_emitv (&gv, g_test_signals[TEST_SIGNAL1], 0, &gv); +g_signal_emitv (&gv, my_test_signals[TEST_SIGNAL1], 0, &gv); g_assert(notifynum==1); g_signal_query(g_signal_lookup("test-signal1",G_TYPE_TEST),&gq); @@ -671,7 +666,7 @@ #endif /*MULTITHREAD*/ #ifdef VERBOSE -g_printf ("\nsignals.c: Completed all tests\n"); +g_printf ("\nsignals-multithread: Completed all tests\n"); #endif #endif /*SYMBIAN*/ diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/BC/tests/refcount/signals-singlethread.c --- a/glib/tsrc/BC/tests/refcount/signals-singlethread.c Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/BC/tests/refcount/signals-singlethread.c Thu Oct 14 14:15:50 2010 +0530 @@ -1,4 +1,8 @@ /* Portion Copyright © 2008-09 Nokia Corporation and/or its subsidiary(-ies). All rights reserved.*/ + + + + #include #include #include @@ -24,12 +28,12 @@ */ #define NULL 0 -#define G_TYPE_TEST (g_test_get_type ()) -#define G_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) -#define G_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) -#define G_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) -#define G_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) -#define G_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) +#define G_TYPE_TEST (my_test_get_type ()) +#define MY_TEST(test) (G_TYPE_CHECK_INSTANCE_CAST ((test), G_TYPE_TEST, GTest)) +#define MY_IS_TEST(test) (G_TYPE_CHECK_INSTANCE_TYPE ((test), G_TYPE_TEST)) +#define MY_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_CAST ((tclass), G_TYPE_TEST, GTestClass)) +#define MY_IS_TEST_CLASS(tclass) (G_TYPE_CHECK_CLASS_TYPE ((tclass), G_TYPE_TEST)) +#define MY_TEST_GET_CLASS(test) (G_TYPE_INSTANCE_GET_CLASS ((test), G_TYPE_TEST, GTestClass)) static GRand *grand; @@ -51,7 +55,7 @@ void (*test_signal2) (GTest * test, gint an_int); }; -static GType g_test_get_type (void); +static GType my_test_get_type (void); static volatile gboolean stopping; /* Element signals and args */ @@ -69,23 +73,23 @@ ARG_TEST_PROP }; -static void g_test_class_init (GTestClass * klass); -static void g_test_init (GTest * test); -static void g_test_dispose (GObject * object); +static void my_test_class_init (GTestClass * klass); +static void my_test_init (GTest * test); +static void my_test_dispose (GObject * object); static void signal2_handler (GTest * test, gint anint); -static void g_test_set_property (GObject * object, guint prop_id, +static void my_test_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); -static void g_test_get_property (GObject * object, guint prop_id, +static void my_test_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static GObjectClass *parent_class = NULL; -static guint g_test_signals[LAST_SIGNAL] = { 0 }; +static guint my_test_signals[LAST_SIGNAL] = { 0 }; static GType -g_test_get_type (void) +my_test_get_type (void) { static GType test_type = 0; @@ -94,12 +98,12 @@ sizeof (GTestClass), NULL, NULL, - (GClassInitFunc) g_test_class_init, + (GClassInitFunc) my_test_class_init, NULL, NULL, sizeof (GTest), 0, - (GInstanceInitFunc) g_test_init, + (GInstanceInitFunc) my_test_init, NULL }; @@ -112,7 +116,7 @@ } static void -g_test_class_init (GTestClass * klass) +my_test_class_init (GTestClass * klass) { GObjectClass *gobject_class; @@ -130,16 +134,15 @@ #endif /*MULTITHREAD*/ #endif /*SYMBAIN*/ + gobject_class->dispose = my_test_dispose; + gobject_class->set_property = my_test_set_property; + gobject_class->get_property = my_test_get_property; - gobject_class->dispose = g_test_dispose; - gobject_class->set_property = g_test_set_property; - gobject_class->get_property = g_test_get_property; - - g_test_signals[TEST_SIGNAL1] = + my_test_signals[TEST_SIGNAL1] = g_signal_new ("test-signal1", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal1), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); - g_test_signals[TEST_SIGNAL2] = + my_test_signals[TEST_SIGNAL2] = g_signal_new ("test-signal2", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (GTestClass, test_signal2), NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); @@ -152,7 +155,7 @@ } static void -g_test_init (GTest * test) +my_test_init (GTest * test) { #ifndef SYMBIAN g_print ("init %p\n", test); @@ -168,11 +171,11 @@ } static void -g_test_dispose (GObject * object) +my_test_dispose (GObject * object) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); g_print ("dispose %p!\n", object); @@ -180,12 +183,12 @@ } static void -g_test_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) +my_test_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -198,12 +201,12 @@ } static void -g_test_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) +my_test_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) { GTest *test; - test = G_TEST (object); + test = MY_TEST (object); switch (prop_id) { case ARG_TEST_PROP: @@ -216,9 +219,9 @@ } static void -g_test_do_signal1 (GTest * test) +my_test_do_signal1 (GTest * test) { - g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL1], 0, 0); + g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL1], 0, 0); } static void @@ -232,13 +235,13 @@ } static void -g_test_do_signal2 (GTest * test) +my_test_do_signal2 (GTest * test) { - g_signal_emit (G_OBJECT (test), g_test_signals[TEST_SIGNAL2], 0, 0); + g_signal_emit (G_OBJECT (test), my_test_signals[TEST_SIGNAL2], 0, 0); } static void -g_test_do_prop (GTest * test) +my_test_do_prop (GTest * test) { test->value = g_rand_int (grand); g_object_notify (G_OBJECT (test), "test-prop"); @@ -253,14 +256,14 @@ while (!stopping) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); if ((i++ % 10000) == 0) { g_print ("."); - g_thread_yield(); /*force context switch */ + g_thread_yield(); /* force context switch */ } } #else @@ -269,11 +272,11 @@ while (!stopping) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); if ((i++ % 10/*000*/) == 0) { #ifdef VERBOSE @@ -286,11 +289,11 @@ for(i=0;i <= LOOP;i++) { if (TESTNUM == 1) - g_test_do_signal1 (test); + my_test_do_signal1 (test); if (TESTNUM == 2) - g_test_do_signal2 (test); + my_test_do_signal2 (test); if (TESTNUM == 3) - g_test_do_prop (test); + my_test_do_prop (test); #ifdef VERBOSE g_print("."); @@ -303,9 +306,6 @@ return NULL; } - - - static void notify (GObject *object, GParamSpec *spec, gpointer user_data) { @@ -317,7 +317,7 @@ #endif g_object_get (object, "test-prop", &value, NULL); - //g_print ("+ %d", value); + /*g_print ("+ %d", value);*/ } #ifdef SYMBIAN @@ -341,7 +341,7 @@ #ifdef SYMBIAN g_log_set_handler (NULL, G_LOG_FLAG_FATAL| G_LOG_FLAG_RECURSION | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING | G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_INFO | G_LOG_LEVEL_DEBUG, &mrtLogHandler, NULL); g_set_print_handler(mrtPrintHandler); - #endif /*SYMBIAN*/ + #endif /*__SYMBIAN32__*/ g_thread_init (NULL); @@ -624,8 +624,8 @@ handlernum=0; -g_signal_emit(G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0); -g_signal_emit(G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit(G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit(G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0); g_assert(handlernum==2); @@ -636,8 +636,8 @@ #endif handlernum=0; -g_signal_emit (G_OBJECT (test1), g_test_signals[TEST_SIGNAL1], 0, 0); -g_signal_emit (G_OBJECT (test2), g_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit (G_OBJECT (test1), my_test_signals[TEST_SIGNAL1], 0, 0); +g_signal_emit (G_OBJECT (test2), my_test_signals[TEST_SIGNAL1], 0, 0); g_assert(handlernum==0); g_assert (strcmp ("test-signal1", g_signal_name (g_signal_lookup("test-signal1",G_TYPE_TEST))) == 0); @@ -653,7 +653,7 @@ g_assert(g_signal_lookup("test-signal1",G_TYPE_TEST)==gi); notifynum=0; -g_signal_emitv (&gv, g_test_signals[TEST_SIGNAL1], 0, &gv); +g_signal_emitv (&gv, my_test_signals[TEST_SIGNAL1], 0, &gv); g_assert(notifynum==1); g_signal_query(g_signal_lookup("test-signal1",G_TYPE_TEST),&gq); @@ -670,9 +670,8 @@ #endif /*MULTITHREAD*/ - #ifdef VERBOSE -g_printf ("\nsignals-multithread.c: Completed all tests\n"); +g_printf ("\nsignals-singlethread.c: Completed all tests\n"); #endif #endif /*SYMBIAN*/ diff -r 28ccaba883f4 -r 403e7f6ed6c5 glib/tsrc/group/bld.inf --- a/glib/tsrc/group/bld.inf Wed Oct 13 19:39:18 2010 +0530 +++ b/glib/tsrc/group/bld.inf Thu Oct 14 14:15:50 2010 +0530 @@ -60,4 +60,3 @@ ../BC/group/mem_profile_test.mmp ../BC/group/g_test1.mmp ../BC/group/g_test2.mmp -../BC/group/helloworld.mmp \ No newline at end of file diff -r 28ccaba883f4 -r 403e7f6ed6c5 layers.sysdef.xml --- a/layers.sysdef.xml Wed Oct 13 19:39:18 2010 +0530 +++ b/layers.sysdef.xml Thu Oct 14 14:15:50 2010 +0530 @@ -4,7 +4,7 @@ - + diff -r 28ccaba883f4 -r 403e7f6ed6c5 lowlevellibsandfws/pluginfw/Framework/frame/EComErr.ra --- a/lowlevellibsandfws/pluginfw/Framework/frame/EComErr.ra Wed Oct 13 19:39:18 2010 +0530 +++ b/lowlevellibsandfws/pluginfw/Framework/frame/EComErr.ra Thu Oct 14 14:15:50 2010 +0530 @@ -191,4 +191,6 @@ RESOURCE TBUF r_ecom_error_noextendedinterfacereleasefunction{ buf="The extended interface release function was not found."; } RESOURCE TBUF r_ecom_error_noextendedinterfacereleaseobject{ buf="The extended interface release function was not found."; } RESOURCE TBUF r_ecom_error_notfoundscantimer{ buf="The Interface implementation could not find a scan timer"; } -RESOURCE TBUF r_ecom_error_listcurrentlyunavailable{ buf="The list is currently unavailable"; } \ No newline at end of file +RESOURCE TBUF r_ecom_error_listcurrentlyunavailable{ buf="The list is currently unavailable"; } + + diff -r 28ccaba883f4 -r 403e7f6ed6c5 ossrv_pub/crypto_certificates_api/inc/stdapis/openssl/x509.h --- a/ossrv_pub/crypto_certificates_api/inc/stdapis/openssl/x509.h Wed Oct 13 19:39:18 2010 +0530 +++ b/ossrv_pub/crypto_certificates_api/inc/stdapis/openssl/x509.h Thu Oct 14 14:15:50 2010 +0530 @@ -61,7 +61,7 @@ * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. */ /* - © Portions copyright (c) 2006 Nokia Corporation. All rights reserved. + © Portions copyright (c) 2006-2010 Nokia Corporation. All rights reserved. */ #ifndef HEADER_X509_H @@ -1027,7 +1027,7 @@ IMPORT_C int X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int type, const unsigned char *bytes, int len); -int X509_REQ_add1_attr_by_txt(X509_REQ *req, +IMPORT_C int X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int type, const unsigned char *bytes, int len); diff -r 28ccaba883f4 -r 403e7f6ed6c5 ossrv_pub/crypto_inputoutput_and_data_encoding_api/inc/stdapis/openssl/bio.h --- a/ossrv_pub/crypto_inputoutput_and_data_encoding_api/inc/stdapis/openssl/bio.h Wed Oct 13 19:39:18 2010 +0530 +++ b/ossrv_pub/crypto_inputoutput_and_data_encoding_api/inc/stdapis/openssl/bio.h Thu Oct 14 14:15:50 2010 +0530 @@ -56,7 +56,7 @@ * [including the GNU Public Licence.] */ /* - © Portions copyright (c) 2006 Nokia Corporation. All rights reserved. + © Portions copyright (c) 2006-2010 Nokia Corporation. All rights reserved. */ #ifndef HEADER_BIO_H @@ -524,8 +524,8 @@ #define BIO_pending(b) (int)BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL) #define BIO_wpending(b) (int)BIO_ctrl(b,BIO_CTRL_WPENDING,0,NULL) /* ...pending macros have inappropriate return type */ -size_t BIO_ctrl_pending(BIO *b); -size_t BIO_ctrl_wpending(BIO *b); +IMPORT_C size_t BIO_ctrl_pending(BIO *b); +IMPORT_C size_t BIO_ctrl_wpending(BIO *b); #define BIO_flush(b) (int)BIO_ctrl(b,BIO_CTRL_FLUSH,0,NULL) #define BIO_get_info_callback(b,cbp) (int)BIO_ctrl(b,BIO_CTRL_GET_CALLBACK,0, \ cbp) @@ -543,9 +543,9 @@ /* macros with inappropriate type -- but ...pending macros use int too: */ #define BIO_get_write_guarantee(b) (int)BIO_ctrl(b,BIO_C_GET_WRITE_GUARANTEE,0,NULL) #define BIO_get_read_request(b) (int)BIO_ctrl(b,BIO_C_GET_READ_REQUEST,0,NULL) -size_t BIO_ctrl_get_write_guarantee(BIO *b); -size_t BIO_ctrl_get_read_request(BIO *b); -int BIO_ctrl_reset_read_request(BIO *b); +IMPORT_C size_t BIO_ctrl_get_write_guarantee(BIO *b); +IMPORT_C size_t BIO_ctrl_get_read_request(BIO *b); +IMPORT_C int BIO_ctrl_reset_read_request(BIO *b); /* ctrl macros for dgram */ #define BIO_ctrl_dgram_connect(b,peer) \ @@ -623,7 +623,7 @@ IMPORT_C int BIO_nwrite(BIO *bio, char **buf, int num); #ifndef OPENSSL_SYS_WIN16 -long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, +IMPORT_C long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, long argl,long ret); #else IMPORT_C long _far _loadds BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi, diff -r 28ccaba883f4 -r 403e7f6ed6c5 ossrv_pub/math_operations_api/inc/stdapis/stlport/stl/_complex.h --- a/ossrv_pub/math_operations_api/inc/stdapis/stlport/stl/_complex.h Wed Oct 13 19:39:18 2010 +0530 +++ b/ossrv_pub/math_operations_api/inc/stdapis/stlport/stl/_complex.h Thu Oct 14 14:15:50 2010 +0530 @@ -766,9 +766,9 @@ #ifdef __SYMBIAN32__ template -#ifdef __WINSCW__ +//#ifdef __WINSCW__ _STLP_DECLSPEC -#endif +//#endif _Tp _STLP_CALL abs_tp(const complex<_Tp>&); template diff -r 28ccaba883f4 -r 403e7f6ed6c5 ssl/libcrypto/src/crypto/certretriever/certretriever.cpp --- a/ssl/libcrypto/src/crypto/certretriever/certretriever.cpp Wed Oct 13 19:39:18 2010 +0530 +++ b/ssl/libcrypto/src/crypto/certretriever/certretriever.cpp Thu Oct 14 14:15:50 2010 +0530 @@ -171,10 +171,7 @@ void CCertRetriever::ConstructL() { - TInt err = iFs.Connect(); - if(err != KErrNone) - User::Leave(err); - + User::LeaveIfError(iFs.Connect()); iState = EInitializeCertStore; iBuf = HBufC8::NewL(KMaxCertLength); } diff -r 28ccaba883f4 -r 403e7f6ed6c5 ssl/libcrypto/src/crypto/certretriever/createx509.cpp --- a/ssl/libcrypto/src/crypto/certretriever/createx509.cpp Wed Oct 13 19:39:18 2010 +0530 +++ b/ssl/libcrypto/src/crypto/certretriever/createx509.cpp Thu Oct 14 14:15:50 2010 +0530 @@ -34,90 +34,86 @@ X509* CX509_Initializer::CreateX509L(CX509Certificate* X509Cert) { X509* ret = X509_new(); - TBool serail = ETrue; - - if(ret != NULL) - { + if(ret == NULL) + return NULL; -//validity - X509_VAL_free(ret->cert_info->validity); - ret->cert_info->validity = CreateX509_VAL(X509Cert); - -//issuer - const CX500DistinguishedName& IssName = X509Cert->IssuerName(); - X509_NAME_free(ret->cert_info->issuer); - ret->cert_info->issuer = CreateX509_NAMEL(IssName); - -//subject - const CX500DistinguishedName& SubName = X509Cert->SubjectName(); - X509_NAME_free(ret->cert_info->subject); - ret->cert_info->subject = CreateX509_NAMEL(SubName); - // const HBufC * name = SubName.DisplayNameL(); - -//signature - const TPtrC8* sig_alg_ptr = X509Cert->DataElementEncoding(CX509Certificate::EAlgorithmId); - X509_ALGOR_free(ret->cert_info->signature); - ret->cert_info->signature = CreateX509_ALGORL(sig_alg_ptr); - -//serialnumber - const TPtrC8 sernum = X509Cert->SerialNumber(); - ASN1_INTEGER_free(ret->cert_info->serialNumber); - ret->cert_info->serialNumber = CreateASN1_STRING(sernum.Length(),V_ASN1_INTEGER,(unsigned char *)sernum.Ptr(),0); - if((sernum.Length()== 1) && sernum[0]==0) - serail = EFalse; + TCleanupItem item((void(*)(void*))X509_free,(void*)ret); + CleanupStack::PushL(item); -//version - - TInt ver = X509Cert->Version(); - unsigned char verVal = (unsigned char)(ver-1); - ASN1_INTEGER_free(ret->cert_info->version); - if( (verVal) || (!serail))// for X509 V1 certificates, version is null if any serial number present. - ret->cert_info->version = CreateASN1_STRING(1,V_ASN1_INTEGER,&verVal,0); - - -//issuerUID - const TPtrC8* issUID_enc = X509Cert->DataElementEncoding(CX509Certificate::EIssuerUID); - if(issUID_enc) - ret->cert_info->issuerUID = CreateASN1_STRING(issUID_enc->Length(),V_ASN1_BIT_STRING,(unsigned char *)issUID_enc->Ptr(),0); + TBool serial = ETrue; + + //validity + X509_VAL_free(ret->cert_info->validity); + ret->cert_info->validity = CreateX509_VAL(X509Cert); + + //issuer + const CX500DistinguishedName& IssName = X509Cert->IssuerName(); + X509_NAME_free(ret->cert_info->issuer); + ret->cert_info->issuer = CreateX509_NAMEL(IssName); + + //subject + const CX500DistinguishedName& SubName = X509Cert->SubjectName(); + X509_NAME_free(ret->cert_info->subject); + ret->cert_info->subject = CreateX509_NAMEL(SubName); + // const HBufC * name = SubName.DisplayNameL(); + + //signature + const TPtrC8* sig_alg_ptr = X509Cert->DataElementEncoding(CX509Certificate::EAlgorithmId); + X509_ALGOR_free(ret->cert_info->signature); + ret->cert_info->signature = CreateX509_ALGORL(sig_alg_ptr); + + //serialnumber + const TPtrC8 sernum = X509Cert->SerialNumber(); + ASN1_INTEGER_free(ret->cert_info->serialNumber); + ret->cert_info->serialNumber = CreateASN1_STRING(sernum.Length(),V_ASN1_INTEGER,(unsigned char *)sernum.Ptr(),0); + if((sernum.Length()== 1) && sernum[0]==0) + serial = EFalse; - -//subjectUID - const TPtrC8* subUID_enc = X509Cert->DataElementEncoding(CX509Certificate::ESubjectUID); - if(subUID_enc) - ret->cert_info->subjectUID = CreateASN1_STRING(subUID_enc->Length(),V_ASN1_BIT_STRING,(unsigned char *)subUID_enc->Ptr(),0); - -//key - X509_PUBKEY_free(ret->cert_info->key); - ret->cert_info->key = CreateX509_PUBKEYL(X509Cert); - + //version + TInt ver = X509Cert->Version(); + unsigned char verVal = (unsigned char)(ver-1); + ASN1_INTEGER_free(ret->cert_info->version); + if( (verVal) || (!serial))// for X509 V1 certificates, version is null if any serial number present. + ret->cert_info->version = CreateASN1_STRING(1,V_ASN1_INTEGER,&verVal,0); + + + //issuerUID + const TPtrC8* issUID_enc = X509Cert->DataElementEncoding(CX509Certificate::EIssuerUID); + if(issUID_enc) + ret->cert_info->issuerUID = CreateASN1_STRING(issUID_enc->Length(),V_ASN1_BIT_STRING,(unsigned char *)issUID_enc->Ptr(),0); + + + //subjectUID + const TPtrC8* subUID_enc = X509Cert->DataElementEncoding(CX509Certificate::ESubjectUID); + if(subUID_enc) + ret->cert_info->subjectUID = CreateASN1_STRING(subUID_enc->Length(),V_ASN1_BIT_STRING,(unsigned char *)subUID_enc->Ptr(),0); -//extension - - - ret->cert_info->extensions = CreateSTACKOF_X509_EXTENSIONL(X509Cert); - - -//name - ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0); - -//sig_alg - X509_ALGOR_free(ret->sig_alg); - ret->sig_alg = CreateX509_ALGORL(sig_alg_ptr); - -//signature - const TPtrC8 sig = X509Cert->Signature(); - ASN1_STRING_free(ret->signature); - ret->signature = CreateASN1_STRING(sig.Length(), V_ASN1_BIT_STRING, (unsigned char *)sig.Ptr(), ASN1_STRING_FLAG_BITS_LEFT); - } - + //key + X509_PUBKEY_free(ret->cert_info->key); + ret->cert_info->key = CreateX509_PUBKEYL(X509Cert); + + //extension + ret->cert_info->extensions = CreateSTACKOF_X509_EXTENSIONL(X509Cert); + + //name + ret->name = X509_NAME_oneline(ret->cert_info->subject, NULL, 0); + + //sig_alg + X509_ALGOR_free(ret->sig_alg); + ret->sig_alg = CreateX509_ALGORL(sig_alg_ptr); + + //signature + const TPtrC8 sig = X509Cert->Signature(); + ASN1_STRING_free(ret->signature); + ret->signature = CreateASN1_STRING(sig.Length(), V_ASN1_BIT_STRING, (unsigned char *)sig.Ptr(), ASN1_STRING_FLAG_BITS_LEFT); + + CleanupStack::Pop(ret); return ret; } X509_ALGOR* CX509_Initializer::CreateX509_ALGORL(const TPtrC8* ptr) { - X509_ALGOR* ret = X509_ALGOR_new(); - TASN1DecGeneric dec((TDesC8 &)*ptr); dec.InitL(); @@ -126,6 +122,8 @@ TASN1DecGeneric& AlgorEncSeq = *(seq->At(0)); + X509_ALGOR* ret = X509_ALGOR_new(); + if (dec.LengthDERContent() > AlgorEncSeq.LengthDER()) // can also check for (seq->Count() > 1) alternatively { // parameter part is present in the encoding. @@ -170,8 +168,6 @@ X509_NAME* CX509_Initializer::CreateX509_NAMEL(const CX500DistinguishedName& DistName) { - X509_NAME* ret = X509_NAME_new(); - CASN1EncSequence * Asn1Seq = DistName.EncodeASN1LC(); HBufC8* octetData = HBufC8::NewMaxLC(5000); @@ -181,8 +177,14 @@ TUint writePos = 0; Asn1Seq->WriteDERL(oct, writePos); + X509_NAME* ret = X509_NAME_new(); + // push the object to a cleanup stack as it is passed to a leaving function. + TCleanupItem item((void(*)(void*))X509_NAME_free,(void*)ret); + CleanupStack::PushL(item); + TInt len = Fill_X509_NAME_ENTRYL(ret, octetData->Des()); + CleanupStack::Pop(ret); char *p = (char *)oct.PtrZ(); ret->bytes->data = (char *)OPENSSL_malloc(len); // no need to free this. BUF_MEM_free will free if not NULL diff -r 28ccaba883f4 -r 403e7f6ed6c5 stdcpp/tsrc/BC/apps/tlocale/src/tlocaleblocks.cpp --- a/stdcpp/tsrc/BC/apps/tlocale/src/tlocaleblocks.cpp Wed Oct 13 19:39:18 2010 +0530 +++ b/stdcpp/tsrc/BC/apps/tlocale/src/tlocaleblocks.cpp Thu Oct 14 14:15:50 2010 +0530 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009 - 2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -1411,7 +1411,7 @@ Mympunct_byname fac("C", 1); testChar ch = fac.my_do_decimal_point(); - if (ch != 0) + if (ch != '.') return KErrGeneral; return KErrNone; diff -r 28ccaba883f4 -r 403e7f6ed6c5 syslibsapitest/syslibssvs/ecom/TestPlugin/Group/TestProduct_PlugIn.mmp --- a/syslibsapitest/syslibssvs/ecom/TestPlugin/Group/TestProduct_PlugIn.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/syslibsapitest/syslibssvs/ecom/TestPlugin/Group/TestProduct_PlugIn.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -38,6 +38,7 @@ SYSTEMINCLUDE /epoc32/include SYSTEMINCLUDE /epoc32/include/ecom +SYSTEMINCLUDE /epoc32/include/platform START RESOURCE 2000371D.rss TARGETPATH /ecom diff -r 28ccaba883f4 -r 403e7f6ed6c5 syslibsapitest/syslibssvs/ecom/group/T_ECOM.mmp --- a/syslibsapitest/syslibssvs/ecom/group/T_ECOM.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/syslibsapitest/syslibssvs/ecom/group/T_ECOM.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -38,7 +38,8 @@ USERINCLUDE ../../common/inc SYSTEMINCLUDE /epoc32/include -SYSTEMINCLUDE /epoc32/include/test +SYSTEMINCLUDE /epoc32/include/platform +SYSTEMINCLUDE /epoc32/include/platform/test LIBRARY euser.lib LIBRARY efsrv.lib diff -r 28ccaba883f4 -r 403e7f6ed6c5 syslibsapitest/syslibssvs/group/TPCopyFileUtility.mmp --- a/syslibsapitest/syslibssvs/group/TPCopyFileUtility.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/syslibsapitest/syslibssvs/group/TPCopyFileUtility.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -27,6 +27,7 @@ USERINCLUDE ../common/inc SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/platform LIBRARY euser.lib LIBRARY EFSRV.LIB diff -r 28ccaba883f4 -r 403e7f6ed6c5 syslibsapitest/syslibssvs/group/TPDeleteFileUtility.mmp --- a/syslibsapitest/syslibssvs/group/TPDeleteFileUtility.mmp Wed Oct 13 19:39:18 2010 +0530 +++ b/syslibsapitest/syslibssvs/group/TPDeleteFileUtility.mmp Thu Oct 14 14:15:50 2010 +0530 @@ -27,6 +27,8 @@ USERINCLUDE ../common/inc SYSTEMINCLUDE /epoc32/include + +SYSTEMINCLUDE /epoc32/include/platform LIBRARY euser.lib LIBRARY EFSRV.LIB