1 ## diff generated by diff_upstream.pl

     1 ## diff generated by diff_upstream.pl

     2 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/library/library.cpp

     2 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/library/library.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/library/library.cpp

     5 @@ -25,6 +25,7 @@

     5 @@ -25,6 +25,7 @@

     6  #include <iostream>

     6  #include <iostream>

     7  #include <iomanip>

     7  #include <iomanip>

     8  #include <cstdlib>

     8  #include <cstdlib>

     9 +#include <cstring>

     9 +#include <cstring>

    18 +	file.read(m_mem_p, size );

    18 +	file.read(m_mem_p, size );

    19  

    19  

    20      file.close();

    20      file.close();

    21  

    21  

    22 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/library/library.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/library/library.h

    22 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/library/library.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/library/library.h

    25 @@ -39,11 +39,12 @@

    25 @@ -39,11 +39,12 @@

    26      const char* _eat_obj_header(const char*, const char*, unsigned long*, const char* = 0) const;

    26      const char* _eat_obj_header(const char*, const char*, unsigned long*, const char* = 0) const;

    27  

    27  

    28  private:

    28  private:

    29 -    const char* m_mem_p;

    29 -    const char* m_mem_p;

    35 +

    35 +

    36      mutable std::vector<const char*> m_symbols;

    36      mutable std::vector<const char*> m_symbols;

    37      mutable std::vector< std::pair<const char*, const char*> > m_objects;

    37      mutable std::vector< std::pair<const char*, const char*> > m_objects;

    38  };

    38  };

    39 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/main.cpp

    39 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/main.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/main.cpp

    42 @@ -22,6 +22,8 @@

    42 @@ -22,6 +22,8 @@

    43  #include <sstream>

    43  #include <sstream>

    44  #include <iostream>

    44  #include <iostream>

    45  #include <stdexcept>

    45  #include <stdexcept>

    46 +#include <cstring>

    46 +#include <cstring>

    47 +#include <cstdlib>

    47 +#include <cstdlib>

    48  

    48  

    49  

    49  

    50  const char SELF_NAME[] = "checklib";

    50  const char SELF_NAME[] = "checklib";

    51 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/object/coff_object.cpp

    51 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/object/coff_object.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/object/coff_object.cpp

    54 @@ -21,6 +21,7 @@

    54 @@ -21,6 +21,7 @@

    55  

    55  

    56  #include <algorithm>

    56  #include <algorithm>

    57  #include <functional>

    57  #include <functional>

    58 +#include <cstring>

    58 +#include <cstring>

    59  

    59  

    60  Coff_object::Coff_object(const char* p1, const char* p2)

    60  Coff_object::Coff_object(const char* p1, const char* p2)

    61  {

    61  {

    62 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/object/elf_object.cpp

    62 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/checklib/object/elf_object.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/checklib/object/elf_object.cpp

    65 @@ -22,6 +22,7 @@

    65 @@ -22,6 +22,7 @@

    66  

    66  

    67  #include <algorithm>

    67  #include <algorithm>

    68  #include <functional>

    68  #include <functional>

    69 +#include <cstring>

    69 +#include <cstring>

    70  

    70  

    71  Elf_object::Elf_object(const char* p1, const char* p2)

    71  Elf_object::Elf_object(const char* p1, const char* p2)

    72  {

    72  {

    73 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/localise.cpp

    73 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/localise.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/localise.cpp

    76 @@ -27,9 +27,11 @@

    76 @@ -27,9 +27,11 @@

    77  #pragma warning( disable : 4530 )	// function not inlined.

    77  #pragma warning( disable : 4530 )	// function not inlined.

    78  #endif

    78  #endif

    79  

    79  

    80 -#include <stdio.h>   

    80 -#include <stdio.h>   

   102 +

   102 +

   103  	ofstream outputFile(LocalisationOutputFileName);

   103  	ofstream outputFile(LocalisationOutputFileName);

   104  

   104  

   105  	String fileLine("");

   105  	String fileLine("");

   106 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/rcomp.cpp

   106 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/rcomp.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/rcomp.cpp

   109 @@ -90,8 +90,8 @@

   109 @@ -90,8 +90,8 @@

   110  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

   110  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

   111  #endif //__VC32__

   111  #endif //__VC32__

   112  

   112  

   113 -#include "resource.h"

   113 -#include "resource.h"

   139 +#include "CTABLE.H"

   139 +#include "CTABLE.H"

   140  #include "localise.h"

   140  #include "localise.h"

   141  #include "main.h"

   141  #include "main.h"

   142  

   142  

   143 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/rcompl.cpp

   143 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/rcompl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/rcompl.cpp

   146 @@ -662,8 +662,8 @@

   146 @@ -662,8 +662,8 @@

   147  #include <limits.h>

   147  #include <limits.h>

   148  #include <string.h>

   148  #include <string.h>

   149  #include "main.h"

   149  #include "main.h"

   150 -#include "structst.h"

   150 -#include "structst.h"

   171 +#include "ERRORHAN.H"

   171 +#include "ERRORHAN.H"

   172  

   172  

   173  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

   173  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

   174  

   174  

   175 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/RCOMP.LEX

   175 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/RCOMP.LEX /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/RCOMP.LEX

   178 @@ -20,9 +20,9 @@

   178 @@ -20,9 +20,9 @@

   179  #include <limits.h>

   179  #include <limits.h>

   180  #include <string.h>

   180  #include <string.h>

   181  #include "main.h"

   181  #include "main.h"

   182 -#include "structst.h"

   182 -#include "structst.h"

   196 +#include "ERRORHAN.H"

   196 +#include "ERRORHAN.H"

   197  

   197  

   198  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

   198  #define REGISTER_LINE	ErrorHandler::Register(pFileLineHandler->GetCurrentFile(), pFileLineHandler->GetErrorLine(* pCurrentLineNumber))

   199  

   199  

   200 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/RCOMP.YACC

   200 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/bintools/rcomp/src/RCOMP.YACC /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/bintools/rcomp/src/RCOMP.YACC

   203 @@ -35,8 +35,8 @@

   203 @@ -35,8 +35,8 @@

   204  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

   204  #pragma warning( disable : 4244 ) // C4244: '=' : conversion from 'int' to 'short', possible loss of data

   205  #endif //__VC32__

   205  #endif //__VC32__

   206  

   206  

   207 -#include "resource.h"

   207 -#include "resource.h"

   233 +#include "CTABLE.H"

   233 +#include "CTABLE.H"

   234  #include "localise.h"

   234  #include "localise.h"

   235  #include "main.h"

   235  #include "main.h"

   236  

   236  

   237 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/buildtoolguides/romtoolsguide/group/bld.inf

   237 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/buildtoolguides/romtoolsguide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/buildtoolguides/romtoolsguide/group/bld.inf

   240 @@ -1,3 +1,3 @@

   240 @@ -1,3 +1,3 @@

   241  

   241  

   242  PRJ_EXPORTS

   242  PRJ_EXPORTS

   243 -../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar

   243 -../com.nokia.rombuild_0.1.jar /plugins/com.nokia.rombuild_0.1.jar

   244 \ No newline at end of file

   244 \ No newline at end of file

   245 +../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar 

   245 +../com.nokia.rombuild_0.1.jar ../../plugins/com.nokia.rombuild_0.1.jar 

   246 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/buildtoolguides/sbsv2guide/group/bld.inf

   246 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/buildtoolguides/sbsv2guide/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/buildtoolguides/sbsv2guide/group/bld.inf

   249 @@ -1,3 +1,3 @@

   249 @@ -1,3 +1,3 @@

   250  

   250  

   251  PRJ_EXPORTS

   251  PRJ_EXPORTS

   252 -../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar

   252 -../com.nokia.sysbuild_0.1.jar /plugins/com.nokia.sysbuild_0.1.jar

   253 \ No newline at end of file

   253 \ No newline at end of file

   254 +../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar

   254 +../com.nokia.sysbuild_0.1.jar ../../plugins/com.nokia.sysbuild_0.1.jar

   255 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp

   255 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/e32lib/e32image/deflate/deflate.cpp

   258 @@ -87,7 +87,7 @@

   258 @@ -87,7 +87,7 @@

   259  

   259  

   260  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

   260  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

   261  	{

   261  	{

   262 -	return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

   262 -	return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

   264  	}

   264  	}

   265  

   265  

   266  inline TInt HDeflateHash::Hash(const TUint8* aPtr)

   266  inline TInt HDeflateHash::Hash(const TUint8* aPtr)

   267 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/e32image: Makefile.elftran.bak

   267 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/e32image: Makefile.elftran.bak

   268 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/e32lib/group/seclib.mmp

   268 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/e32lib/group/seclib.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/e32lib/group/seclib.mmp

   271 @@ -45,8 +45,11 @@

   271 @@ -45,8 +45,11 @@

   272  userinclude     ../setcap 

   272  userinclude     ../setcap 

   273  userinclude     ../../e32lib/e32image/inc

   273  userinclude     ../../e32lib/e32image/inc

   274  systeminclude   /epoc32/include

   274  systeminclude   /epoc32/include

   275 +systeminclude    /epoc32/include/platform

   275 +systeminclude    /epoc32/include/platform

   279 +

   279 +

   280  

   280  

   281  //macro __PLACEMENT_NEW_INLINE

   281  //macro __PLACEMENT_NEW_INLINE

   282  //macro __PLACEMENT_VEC_NEW_INLINE

   282  //macro __PLACEMENT_VEC_NEW_INLINE

   283 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/group/elf2e32.mmp

   283 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/group/elf2e32.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/group/elf2e32.mmp

   286 @@ -28,7 +28,9 @@

   286 @@ -28,7 +28,9 @@

   287  source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp

   287  source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp

   288  

   288  

   289  systeminclude    /epoc32/include  /epoc32/include/tools  

   289  systeminclude    /epoc32/include  /epoc32/include/tools  

   290 +systeminclude    /epoc32/include/platform

   290 +systeminclude    /epoc32/include/platform

   292 +userinclude ../../../bintools/elftools/inc

   292 +userinclude ../../../bintools/elftools/inc

   293  

   293  

   294  option 	GCC -w

   294  option 	GCC -w

   295  

   295  

   296 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/deffile.cpp

   296 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/deffile.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/deffile.cpp

   299 @@ -18,9 +18,11 @@

   299 @@ -18,9 +18,11 @@

   300  //

   300  //

   301  

   301  

   302  //

   302  //

   303 -#include <stdio.h>

   303 -#include <stdio.h>

   309 +

   309 +

   310  

   310  

   311  #include "pl_symbol.h"

   311  #include "pl_symbol.h"

   312  #include "deffile.h"

   312  #include "deffile.h"

   313 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/deflatecompress.cpp

   313 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/deflatecompress.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/deflatecompress.cpp

   316 @@ -126,7 +126,8 @@

   316 @@ -126,7 +126,8 @@

   317  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

   317  inline HDeflateHash* HDeflateHash::NewLC(TInt aLinks)

   318  {

   318  {

   319  	//return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

   319  	//return new(HMem::Alloc(0,_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)]))) HDeflateHash;

   320 -	return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash;

   320 -	return new(new char[_FOFF(HDeflateHash,iOffset[Min(aLinks,KDeflateMaxDistance)])]) HDeflateHash;

   322 +		(sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;

   322 +		(sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;

   323  }

   323  }

   324  

   324  

   325  /**

   325  /**

   326 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/e32exporttable.cpp

   326 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/e32exporttable.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/e32exporttable.cpp

   329 @@ -18,6 +18,7 @@

   329 @@ -18,6 +18,7 @@

   330  #include "pl_elfexports.h"

   330  #include "pl_elfexports.h"

   331  #include "pl_dllsymbol.h"

   331  #include "pl_dllsymbol.h"

   332  #include "pl_elflocalrelocation.h"

   332  #include "pl_elflocalrelocation.h"

   333 +#include <cstring>

   333 +#include <cstring>

   334  

   334  

   335  /**

   335  /**

   336  Destructor for E32ExportTable class.

   336  Destructor for E32ExportTable class.

   337 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/e32imagefile.cpp

   337 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/e32imagefile.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/e32imagefile.cpp

   340 @@ -21,6 +21,7 @@

   340 @@ -21,6 +21,7 @@

   341  

   341  

   342  // get E32ImageHeader class...

   342  // get E32ImageHeader class...

   343  #define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION

   343  #define INCLUDE_E32IMAGEHEADER_IMPLEMENTATION

   344 +#include <cstdio>

   344 +#include <cstdio>

   392 +	memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size());

   392 +	memcpy(aInfo+aPos, &*iSymbolNames.begin(), iSymbolNames.size());

   393  

   393  

   394  	// At the end, the dependencies are listed. They remain zeroes and shall be fixed up

   394  	// At the end, the dependencies are listed. They remain zeroes and shall be fixed up

   395  	// while relocating.

   395  	// while relocating.

   396 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp

   396 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/elffilesupplied.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/elffilesupplied.cpp

   399 @@ -25,7 +25,15 @@

   399 @@ -25,7 +25,15 @@

   400  

   400  

   401  #include <algorithm>

   401  #include <algorithm>

   402  #include <iostream>

   402  #include <iostream>

   403 -#include<hash_set>

   403 -#include<hash_set>

   430 +  SET_TYPE<const char*, HASH_FUN<const char*>, eqstr>::const_iterator it

   430 +  SET_TYPE<const char*, HASH_FUN<const char*>, eqstr>::const_iterator it

   431      = aSymbolSet.find(aSymbol);

   431      = aSymbolSet.find(aSymbol);

   432    if(it != aSymbolSet.end())

   432    if(it != aSymbolSet.end())

   433  	return 1;

   433  	return 1;

   434 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/errorhandler.cpp

   434 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/errorhandler.cpp

   437 @@ -26,7 +26,9 @@

   437 @@ -26,7 +26,9 @@

   438  #include "errorhandler.h"

   438  #include "errorhandler.h"

   439  #include "messagehandler.h"

   439  #include "messagehandler.h"

   440  #include <iostream>

   440  #include <iostream>

   441 -#include <stdio.h>

   441 -#include <stdio.h>

   444 +

   444 +

   445  using std::cerr;

   445  using std::cerr;

   446  using std::endl;

   446  using std::endl;

   447  

   447  

   448 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/huffman.cpp

   448 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/huffman.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/huffman.cpp

   451 @@ -22,6 +22,7 @@

   451 @@ -22,6 +22,7 @@

   452  #endif

   452  #endif

   453  

   453  

   454  #include <cassert>

   454  #include <cassert>

   455 +#include <cstring>

   455 +#include <cstring>

   456  #include "huffman.h"

   456  #include "huffman.h"

   457  #include "errorhandler.h"

   457  #include "errorhandler.h"

   458  #include "farray.h"

   458  #include "farray.h"

   459 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/h_utl.cpp

   459 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/h_utl.cpp

   462 @@ -17,8 +17,9 @@

   462 @@ -17,8 +17,9 @@

   463  // 

   463  // 

   464  //

   464  //

   465  

   465  

   466 -#include <stdlib.h>

   466 -#include <stdlib.h>

   471  #include "h_utl.h"

   471  #include "h_utl.h"

   472  

   472  

   473  /**

   473  /**

   474 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source: h_utl.h.bak

   474 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source: h_utl.h.bak

   475 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/inflate.cpp

   475 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/inflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/inflate.cpp

   478 @@ -23,6 +23,8 @@

   478 @@ -23,6 +23,8 @@

   479  #include "farray.h"

   479  #include "farray.h"

   480  #include "errorhandler.h"

   480  #include "errorhandler.h"

   481  #include<iostream>

   481  #include<iostream>

   482 +#include <cstring>

   482 +#include <cstring>

   483 +

   483 +

   484  using std::cout;

   484  using std::cout;

   485  

   485  

   486  /*

   486  /*

   487 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/librarytarget.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/librarytarget.cpp

   487 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/librarytarget.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/librarytarget.cpp

   490 @@ -21,6 +21,7 @@

   490 @@ -21,6 +21,7 @@

   491  #include "pl_dso_handler.h"

   491  #include "pl_dso_handler.h"

   492  #include "deffile.h"

   492  #include "deffile.h"

   493  #include <iostream>

   493  #include <iostream>

   494 +#include <cstdlib>

   494 +#include <cstdlib>

   495  

   495  

   496  /**

   496  /**

   497  Constructor for the Library Class

   497  Constructor for the Library Class

   498 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/messageimplementation.cpp

   498 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/messageimplementation.cpp

   501 @@ -23,7 +23,9 @@

   501 @@ -23,7 +23,9 @@

   502  #include<iostream>

   502  #include<iostream>

   503  #include<stdarg.h>

   503  #include<stdarg.h>

   504  #include<string>

   504  #include<string>

   505 -#include <stdio.h>

   505 -#include <stdio.h>

   508 +

   508 +

   509  

   509  

   510  using std::endl;

   510  using std::endl;

   511  using std::cout;

   511  using std::cout;

   512 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/parametermanager.cpp

   512 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/parametermanager.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/parametermanager.cpp

   515 @@ -25,6 +25,7 @@

   515 @@ -25,6 +25,7 @@

   516  #include "parametermanager.h"

   516  #include "parametermanager.h"

   517  #include "errorhandler.h"

   517  #include "errorhandler.h"

   518  #include <iostream>

   518  #include <iostream>

   519 +#include <cstdlib>

   519 +#include <cstdlib>

   546 +			ParseCapability1(&*b, &*e, aCapabilities, invert);

   546 +			ParseCapability1(&*b, &*e, aCapabilities, invert);

   547  

   547  

   548  		b = e;

   548  		b = e;

   549  		

   549  		

   550 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/parametermanager.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/parametermanager.h

   550 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/parametermanager.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/parametermanager.h

   553 @@ -81,7 +81,7 @@

   553 @@ -81,7 +81,7 @@

   554  	typedef std::map<string, const OptionDesc *, OptionCompare> OptionMap;

   554  	typedef std::map<string, const OptionDesc *, OptionCompare> OptionMap;

   555  	typedef vector<char *> LibSearchPaths;

   555  	typedef vector<char *> LibSearchPaths;

   556  

   556  

   557 -	typedef void (*ParserFn)(ParameterManager *, char *, char *, const OptionDesc *);

   557 -	typedef void (*ParserFn)(ParameterManager *, char *, char *, const OptionDesc *);

   558 +	typedef void (*ParserFn)(ParameterManager *, char const *, char const *, const OptionDesc *);

   558 +	typedef void (*ParserFn)(ParameterManager *, char const *, char const *, const OptionDesc *);

   559  

   559  

   560  

   560  

   561  	#define DECLARE_PARAM_PARSER(name) \

   561  	#define DECLARE_PARAM_PARSER(name) \

   562 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h

   562 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfexecutable.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfexecutable.h

   565 @@ -22,13 +22,19 @@

   565 @@ -22,13 +22,19 @@

   566  

   566  

   567  #include "pl_common.h"

   567  #include "pl_common.h"

   568  #include <list>

   568  #include <list>

   569 -#include <hash_map>

   569 -#include <hash_map>

   592 +	MAP_TYPE<PLUINT32, DllSymbol*>	iSymbolTable; //The representation

   592 +	MAP_TYPE<PLUINT32, DllSymbol*>	iSymbolTable; //The representation

   593  

   593  

   594  	/**

   594  	/**

   595  	 * The static symbol table.

   595  	 * The static symbol table.

   596 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp

   596 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfexports.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfexports.cpp

   599 @@ -20,6 +20,7 @@

   599 @@ -20,6 +20,7 @@

   600  #include "pl_elfexports.h"

   600  #include "pl_elfexports.h"

   601  #include "pl_elfexecutable.h"

   601  #include "pl_elfexecutable.h"

   602  #include "pl_dllsymbol.h"

   602  #include "pl_dllsymbol.h"

   603 +#include <cstring>

   603 +#include <cstring>

   604  

   604  

   605  using std::set_difference;

   605  using std::set_difference;

   606  

   606  

   607 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp

   607 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfimports.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfimports.cpp

   610 @@ -19,6 +19,7 @@

   610 @@ -19,6 +19,7 @@

   611  

   611  

   612  #include "pl_elfimports.h"

   612  #include "pl_elfimports.h"

   613  #include "pl_elfimportrelocation.h"

   613  #include "pl_elfimportrelocation.h"

   614 +#include <cstring>

   614 +#include <cstring>

   615  

   615  

   616  /**

   616  /**

   617  Constructor for class ElfImports

   617  Constructor for class ElfImports

   618 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp

   618 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_elfproducer.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_elfproducer.cpp

   621 @@ -22,6 +22,7 @@

   621 @@ -22,6 +22,7 @@

   622  #include <stdio.h>

   622  #include <stdio.h>

   623  #include <string>

   623  #include <string>

   624  #include "errorhandler.h"

   624  #include "errorhandler.h"

   625 +#include <cstring>

   625 +#include <cstring>

   626  

   626  

   627  /**

   627  /**

   628   * Following array is indexed on the SECTION_INDEX enum 

   628   * Following array is indexed on the SECTION_INDEX enum 

   629 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_symbol.cpp

   629 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/e32tools/elf2e32/source/pl_symbol.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/e32tools/elf2e32/source/pl_symbol.cpp

   632 @@ -18,6 +18,7 @@

   632 @@ -18,6 +18,7 @@

   633  //

   633  //

   634  

   634  

   635  #include "pl_symbol.h"

   635  #include "pl_symbol.h"

   636 +#include <cstring>

   636 +#include <cstring>

   640 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: cdf.dtd.bak

   640 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: cdf.dtd.bak

   641 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: featuredatabase.dtd.bak

   641 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: featuredatabase.dtd.bak

   642 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: featureuids.dtd.bak

   642 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: featureuids.dtd.bak

   643 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: imageContent.dtd.bak

   643 Only in /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/buildrom/tools: imageContent.dtd.bak

   644 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/group/bld.inf

   644 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/group/bld.inf /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/group/bld.inf

   647 @@ -21,8 +21,10 @@

   647 @@ -21,8 +21,10 @@

   648  

   648  

   649  // These libraries needs to be exported

   649  // These libraries needs to be exported

   650  PRJ_EXPORTS

   650  PRJ_EXPORTS

   651 +#ifndef TOOLS2_LINUX

   651 +#ifndef TOOLS2_LINUX

   654 +#endif

   654 +#endif

   655  ../src/imgcheck.xsl			/epoc32/tools/imgcheck.xsl

   655  ../src/imgcheck.xsl			/epoc32/tools/imgcheck.xsl

   656  ./imgcheck.pl				/epoc32/tools/imgcheck.pl

   656  ./imgcheck.pl				/epoc32/tools/imgcheck.pl

   657  ./imgcheck.cmd				/epoc32/tools/imgcheck.cmd

   657  ./imgcheck.cmd				/epoc32/tools/imgcheck.cmd

   658 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/group/imgcheck.mmp

   658 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/group/imgcheck.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/group/imgcheck.mmp

   661 @@ -25,17 +25,24 @@

   661 @@ -25,17 +25,24 @@

   662  SOURCE		exceptionimplementation.cpp exceptionreporter.cpp

   662  SOURCE		exceptionimplementation.cpp exceptionreporter.cpp

   663  SOURCE 		cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp

   663  SOURCE 		cmdlinewriter.cpp xmlwriter.cpp dbgflagchecker.cpp

   664  USERINCLUDE ../libimgutils/inc ../inc ../../imglib/compress

   664  USERINCLUDE ../libimgutils/inc ../inc ../../imglib/compress

   665 +#ifndef TOOLS2_LINUX

   665 +#ifndef TOOLS2_LINUX

   685 +OPTION    GCC -pthread -O2 -Wno-uninitialized -isystem /usr/include/libxml2 -lxml2 -lboost_thread-mt

   685 +OPTION    GCC -pthread -O2 -Wno-uninitialized -isystem /usr/include/libxml2 -lxml2 -lboost_thread-mt

   686  #else

   686  #else

   687  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

   687  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

   688  OPTION    GCC -mthreads -O2 -Wno-uninitialized

   688  OPTION    GCC -mthreads -O2 -Wno-uninitialized

   689 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h

   689 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/cmdlinehandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/cmdlinehandler.h

   692 @@ -120,7 +120,7 @@

   692 @@ -120,7 +120,7 @@

   693  @internalComponent

   693  @internalComponent

   694  @released

   694  @released

   695  */

   695  */

   696 -typedef enum Suppress

   696 -typedef enum Suppress

   706 +enum NumberOfValue

   706 +enum NumberOfValue

   707  {

   707  {

   708      ENone = 0x0,

   708      ENone = 0x0,

   709      ESingle = 0x1,

   709      ESingle = 0x1,

   710 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/common.h

   710 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/common.h

   713 @@ -86,7 +86,7 @@

   713 @@ -86,7 +86,7 @@

   714  @internalComponent

   714  @internalComponent

   715  @released

   715  @released

   716  */

   716  */

   717 -typedef enum ReturnType

   717 -typedef enum ReturnType

   718 +enum ReturnType

   718 +enum ReturnType

   719  {

   719  {

   720  	ESuccess = 0,

   720  	ESuccess = 0,

   721  	EQuit,

   721  	EQuit,

   722 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h

   722 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/exceptionimplementation.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/exceptionimplementation.h

   725 @@ -91,7 +91,7 @@

   725 @@ -91,7 +91,7 @@

   726  struct Messages

   726  struct Messages

   727  {

   727  {

   728  	int iIndex;

   728  	int iIndex;

   729 -	char* iMessage;

   729 -	char* iMessage;

   739 +	Ofstream iLogStream;

   739 +	Ofstream iLogStream;

   740  	IndexVsMessageMap iMessage;

   740  	IndexVsMessageMap iMessage;

   741  	unsigned int iMsgIndex;

   741  	unsigned int iMsgIndex;

   742  	static unsigned int iCmdFlag;

   742  	static unsigned int iCmdFlag;

   743 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/xmlwriter.h

   743 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/inc/xmlwriter.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/inc/xmlwriter.h

   746 @@ -24,7 +24,12 @@

   746 @@ -24,7 +24,12 @@

   747  #define XMLWRITER_H

   747  #define XMLWRITER_H

   748  

   748  

   749  #include "reportwriter.h"

   749  #include "reportwriter.h"

   750 -#include "libxml/xmlwriter.h"

   750 -#include "libxml/xmlwriter.h"

   765 +	Ofstream iXmlFile;

   765 +	Ofstream iXmlFile;

   766  	// Xml file name for output.

   766  	// Xml file name for output.

   767  	const String iXmlFileName;

   767  	const String iXmlFileName;

   768  	// Xml Buffer pointer.

   768  	// Xml Buffer pointer.

   769 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/inc/romfsentry.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/inc/romfsentry.h

   769 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/inc/romfsentry.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/inc/romfsentry.h

   772 @@ -32,7 +32,7 @@

   772 @@ -32,7 +32,7 @@

   773  class RomImageFSEntry 

   773  class RomImageFSEntry 

   774  {

   774  {

   775  public:

   775  public:

   776 -	RomImageFSEntry (char* aName) 

   776 -	RomImageFSEntry (char* aName) 

   786 +	RomImageDirEntry(char const* aName) : RomImageFSEntry(aName)

   786 +	RomImageDirEntry(char const* aName) : RomImageFSEntry(aName)

   787  	{

   787  	{

   788  	}

   788  	}

   789  	~RomImageDirEntry(void)

   789  	~RomImageDirEntry(void)

   790 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h

   790 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/inc/typedefs.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/inc/typedefs.h

   793 @@ -28,8 +28,8 @@

   793 @@ -28,8 +28,8 @@

   794  

   794  

   795  #undef _L

   795  #undef _L

   796  

   796  

   797 -#include <fstream.h>

   797 -#include <fstream.h>

   823 +enum EImageType

   823 +enum EImageType

   824  {

   824  {

   825  	EUnknownImage,

   825  	EUnknownImage,

   826  	ERomImage,

   826  	ERomImage,

   827 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp

   827 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/src/dirreader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/src/dirreader.cpp

   830 @@ -119,9 +119,9 @@

   830 @@ -119,9 +119,9 @@

   831  void DirReader::ProcessImage()

   831  void DirReader::ProcessImage()

   832  {

   832  {

   833  	char* cwd = new char[MAXPATHLEN];

   833  	char* cwd = new char[MAXPATHLEN];

   834 -	getcwd(cwd,MAXPATHLEN);

   834 -	getcwd(cwd,MAXPATHLEN);

   850 + 

   850 + 

   851  	E32Image* e32Image = KNull;

   851  	E32Image* e32Image = KNull;

   852  

   852  

   853  #ifdef __LINUX__

   853  #ifdef __LINUX__

   854 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/src/e32reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/src/e32reader.cpp

   854 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/libimgutils/src/e32reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/libimgutils/src/e32reader.cpp

   857 @@ -24,6 +24,7 @@

   857 @@ -24,6 +24,7 @@

   858  

   858  

   859  #include "e32reader.h"

   859  #include "e32reader.h"

   860  #include <f32image.h>

   860  #include <f32image.h>

   861 +#include <cstdlib>

   861 +#include <cstdlib>

   862  

   862  

   863  /** 

   863  /** 

   864  Constructor.

   864  Constructor.

   865 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp

   865 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/cmdlinehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/cmdlinehandler.cpp

   868 @@ -25,6 +25,7 @@

   868 @@ -25,6 +25,7 @@

   869  */

   869  */

   870  

   870  

   871  #include "cmdlinehandler.h"

   871  #include "cmdlinehandler.h"

   872 +#include <cstring>

   872 +#include <cstring>

   873  

   873  

   874  /**

   874  /**

   875  Constructor initializes the iOptionMap with short and long option names as key and

   875  Constructor initializes the iOptionMap with short and long option names as key and

   876 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp

   876 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/cmdlinewriter.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/cmdlinewriter.cpp

   879 @@ -24,6 +24,7 @@

   879 @@ -24,6 +24,7 @@

   880  */

   880  */

   881  

   881  

   882  #include "cmdlinewriter.h"

   882  #include "cmdlinewriter.h"

   883 +#include <cstring>

   883 +#include <cstring>

   884  

   884  

   885  /**

   885  /**

   886  Constructor: CmdLineWriter class

   886  Constructor: CmdLineWriter class

   887 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp

   887 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/exceptionimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/exceptionimplementation.cpp

   890 @@ -187,7 +187,7 @@

   890 @@ -187,7 +187,7 @@

   891      

   891      

   892  	if(iCmdFlag & KVerbose)

   892  	if(iCmdFlag & KVerbose)

   893  	{

   893  	{

   894 -		cout << aMsg.c_str() << endl;

   894 -		cout << aMsg.c_str() << endl;

   908 -		cerr << aMsg.c_str() << endl;

   908 -		cerr << aMsg.c_str() << endl;

   909 +		std::cerr << aMsg.c_str() << std::endl;

   909 +		std::cerr << aMsg.c_str() << std::endl;

   910  	}

   910  	}

   911  }

   911  }

   912 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/sidchecker.cpp

   912 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/sidchecker.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/sidchecker.cpp

   915 @@ -249,8 +249,8 @@

   915 @@ -249,8 +249,8 @@

   916  	{

   916  	{

   917  		exeAtt->iAttStatus = KNull;

   917  		exeAtt->iAttStatus = KNull;

   918  	}

   918  	}

   919 -	if((iAllExecutables 

   919 -	if((iAllExecutables 

   922 +		|| (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty())

   922 +		|| (exeAtt->iAttStatus == KDuplicate)) && !exeAtt->iAttStatus.empty())

   923  		|| iNoCheck)

   923  		|| iNoCheck)

   924  	{

   924  	{

   925  		aExeContainer->iExeAttList.push_back(exeAtt);

   925  		aExeContainer->iExeAttList.push_back(exeAtt);

   926 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/xmlwriter.cpp

   926 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imgcheck/src/xmlwriter.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imgcheck/src/xmlwriter.cpp

   929 @@ -24,9 +24,10 @@

   929 @@ -24,9 +24,10 @@

   930  */

   930  */

   931  

   931  

   932  #include "xmlwriter.h"

   932  #include "xmlwriter.h"

   933 +#include <cstring>

   933 +#include <cstring>

   955 +	Ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out);

   955 +	Ofstream xslDestHandle(xslDestPath.c_str(), Ios::binary | Ios::out);

   956  	if(!xslDestHandle)

   956  	if(!xslDestHandle)

   957  	{

   957  	{

   958  		delete [] filetocopy;

   958  		delete [] filetocopy;

   959 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp

   959 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/boostlibrary/boost/thread/pthread/thread_data.hpp

   962 @@ -8,7 +8,7 @@

   962 @@ -8,7 +8,7 @@

   963  #include <boost/thread/detail/config.hpp>

   963  #include <boost/thread/detail/config.hpp>

   964  #include <boost/thread/exceptions.hpp>

   964  #include <boost/thread/exceptions.hpp>

   965  #include <boost/shared_ptr.hpp>

   965  #include <boost/shared_ptr.hpp>

   966 -#include <boost/enable_shared_from_this.hpp>

   966 -#include <boost/enable_shared_from_this.hpp>

   967 +#include <boost/smart_ptr/enable_shared_from_this.hpp>

   967 +#include <boost/smart_ptr/enable_shared_from_this.hpp>

   968  #include <boost/thread/mutex.hpp>

   968  #include <boost/thread/mutex.hpp>

   969  #include <boost/optional.hpp>

   969  #include <boost/optional.hpp>

   970  #include <pthread.h>

   970  #include <pthread.h>

   971 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp

   971 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32image/deflate/deflate.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32image/deflate/deflate.cpp

   974 @@ -20,6 +20,7 @@

   974 @@ -20,6 +20,7 @@

   975  #include "deflate.h"

   975  #include "deflate.h"

   976  #include "h_utl.h"

   976  #include "h_utl.h"

   977  #include "panic.h"

   977  #include "panic.h"

   978 +#define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000)

   978 +#define OFFSETOF(c,f) (((TInt)&(((c *)0x1000)->f))-0x1000)

   988 +		(sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;

   988 +		(sizeof(TOffset) * Min(aLinks,KDeflateMaxDistance))]) HDeflateHash;

   989  	}

   989  	}

   990  

   990  

   991  inline TInt HDeflateHash::Hash(const TUint8* aPtr)

   991  inline TInt HDeflateHash::Hash(const TUint8* aPtr)

   992 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32image/deflate/panic.cpp

   992 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32image/deflate/panic.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32image/deflate/panic.cpp

   995 @@ -21,7 +21,7 @@

   995 @@ -21,7 +21,7 @@

   996  #include "h_utl.h"

   996  #include "h_utl.h"

   997  #include <stdlib.h>

   997  #include <stdlib.h>

   998  

   998  

   999 -char* HuffmanError[]=	{

   999 -char* HuffmanError[]=	{

  1000 +char const * HuffmanError[]=	{

  1000 +char const * HuffmanError[]=	{

  1001  						"Huffman: Too many codes\n",

  1001  						"Huffman: Too many codes\n",

  1002  						"Huffman: Invalid coding\n",

  1002  						"Huffman: Invalid coding\n",

  1003  						"Huffman: Buffer overflow\n",

  1003  						"Huffman: Buffer overflow\n",

  1004 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32uid/uidcrc.cpp

  1004 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/e32uid/uidcrc.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/e32uid/uidcrc.cpp

  1007 @@ -55,7 +55,7 @@

  1007 @@ -55,7 +55,7 @@

  1008  

  1008  

  1009  	for (i=1; i<4; i++)

  1009  	for (i=1; i<4; i++)

  1010  		{

  1010  		{

  1011 -		char* endptr = "failed";

  1011 -		char* endptr = "failed";

  1012 +		char * endptr;

  1012 +		char * endptr;

  1013  		uids[i] = strtoul(argv[i],&endptr,0);

  1013  		uids[i] = strtoul(argv[i],&endptr,0);

  1014  		if (*endptr!='\0')

  1014  		if (*endptr!='\0')

  1015  			{

  1015  			{

  1016 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/errorhandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/errorhandler.h

  1016 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/errorhandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/errorhandler.h

  1019 @@ -36,8 +36,8 @@

  1019 @@ -36,8 +36,8 @@

  1020  class ErrorHandler

  1020  class ErrorHandler

  1021  {

  1021  {

  1022  	public:

  1022  	public:

  1023 -		ErrorHandler(int aMessageIndex,char* aSubMessage,char* aFileName, int aLineNumber);

  1023 -		ErrorHandler(int aMessageIndex,char* aSubMessage,char* aFileName, int aLineNumber);

  1026 +        ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber);

  1026 +        ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber);

  1027  		virtual ~ErrorHandler();

  1027  		virtual ~ErrorHandler();

  1028  		void Report();

  1028  		void Report();

  1029  

  1029  

  1030 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/filesysteminterface.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/filesysteminterface.h

  1030 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/filesysteminterface.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/filesysteminterface.h

  1033 @@ -24,6 +24,7 @@

  1033 @@ -24,6 +24,7 @@

  1034  

  1034  

  1035  #include "directory.h"

  1035  #include "directory.h"

  1036  #include <fstream>

  1036  #include <fstream>

  1037 +#include <cstdlib>

  1037 +#include <cstdlib>

  1038  

  1038  

  1039  typedef std::ofstream Ofstream;

  1039  typedef std::ofstream Ofstream;

  1040  

  1040  

  1041 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/messagehandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/messagehandler.h

  1041 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/messagehandler.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/messagehandler.h

  1044 @@ -36,9 +36,9 @@

  1044 @@ -36,9 +36,9 @@

  1045      public:

  1045      public:

  1046  		static Message *GetInstance();

  1046  		static Message *GetInstance();

  1047  		static void CleanUp();

  1047  		static void CleanUp();

  1048 -		static void StartLogging(char *filename);

  1048 -		static void StartLogging(char *filename);

  1053 +		static void ReportMessage(int aMsgType, int aMsgIndex,char const* aName);

  1053 +		static void ReportMessage(int aMsgType, int aMsgIndex,char const* aName);

  1054  

  1054  

  1055      private:

  1055      private:

  1056  		static Message* iInstance;

  1056  		static Message* iInstance;

  1057 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/messageimplementation.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/messageimplementation.h

  1057 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/include/messageimplementation.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/include/messageimplementation.h

  1060 @@ -84,7 +84,7 @@

  1060 @@ -84,7 +84,7 @@

  1061  		// display message to output device

  1061  		// display message to output device

  1062  		virtual void Output(const char *aName) =0;

  1062  		virtual void Output(const char *aName) =0;

  1063  		// start logging to a file

  1063  		// start logging to a file

  1064 -		virtual void StartLogging(char *fileName)=0;

  1064 -		virtual void StartLogging(char *fileName)=0;

  1074 +		void StartLogging(char const *fileName);

  1074 +		void StartLogging(char const *fileName);

  1075  		void ReportMessage(int aMsgType, int aMsgIndex,...);

  1075  		void ReportMessage(int aMsgType, int aMsgIndex,...);

  1076  		void InitializeMessages();

  1076  		void InitializeMessages();

  1077      private:

  1077      private:

  1078 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/cluster.cpp

  1078 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/cluster.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/cluster.cpp

  1081 @@ -143,7 +143,9 @@

  1081 @@ -143,7 +143,9 @@

  1082  {

  1082  {

  1083  	if(iCurrentClusterNumber >= iTotalNumberOfClusters)

  1083  	if(iCurrentClusterNumber >= iTotalNumberOfClusters)

  1084  	{

  1084  	{

  1085 -    	throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__);

  1085 -    	throw ErrorHandler(IMAGESIZETOOBIG,"Occupied number of clusters count exceeded than available clusters",__FILE__,__LINE__);

  1088 +			__FILE__,__LINE__);

  1088 +			__FILE__,__LINE__);

  1089  	}

  1089  	}

  1090  	++iCurrentClusterNumber;

  1090  	++iCurrentClusterNumber;

  1091  }

  1091  }

  1092 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp

  1092 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/dirregion.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/dirregion.cpp

  1095 @@ -49,7 +49,7 @@

  1095 @@ -49,7 +49,7 @@

  1096  	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);

  1096  	iClusterPtr = CCluster::Instance(iClusterSize,totalClusters);

  1097  	if(iClusterPtr == NULL)

  1097  	if(iClusterPtr == NULL)

  1098  	{

  1098  	{

  1099 -		throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__);

  1099 -		throw ErrorHandler(CLUSTERERROR,"Instance creation error", __FILE__, __LINE__);

  1172 +		throw ErrorHandler(ROOTNOTFOUND,__FILE__,__LINE__);

  1172 +		throw ErrorHandler(ROOTNOTFOUND,__FILE__,__LINE__);

  1173  	}

  1173  	}

  1174  }

  1174  }

  1175  

  1175  

  1176 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp

  1176 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/errorhandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/errorhandler.cpp

  1179 @@ -22,9 +22,10 @@

  1179 @@ -22,9 +22,10 @@

  1180  

  1180  

  1181  #include "errorhandler.h"

  1181  #include "errorhandler.h"

  1182  #include "messagehandler.h"

  1182  #include "messagehandler.h"

  1183 +#include <cstring>

  1183 +#include <cstring>

  1206 +ErrorHandler::ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber)

  1206 +ErrorHandler::ErrorHandler(int aMessageIndex, char const* aFileName, int aLineNumber)

  1207                              : iFileName(aFileName), iLineNumber(aLineNumber)

  1207                              : iFileName(aFileName), iLineNumber(aLineNumber)

  1208  {

  1208  {

  1209  	iMessageIndex = aMessageIndex;

  1209  	iMessageIndex = aMessageIndex;

  1210 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp

  1210 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat16bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat16bootsector.cpp

  1213 @@ -21,6 +21,7 @@

  1213 @@ -21,6 +21,7 @@

  1214  */

  1214  */

  1215  

  1215  

  1216  #include "fat16bootsector.h"

  1216  #include "fat16bootsector.h"

  1217 +#include <cstring>

  1217 +#include <cstring>

  1218  

  1218  

  1219  /**

  1219  /**

  1220  Constructor of the fat16 boot sector class

  1220  Constructor of the fat16 boot sector class

  1221 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp

  1221 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat16filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat16filesystem.cpp

  1224 @@ -21,7 +21,7 @@

  1224 @@ -21,7 +21,7 @@

  1225  */

  1225  */

  1226  

  1226  

  1227  #include"fat16filesystem.h"

  1227  #include"fat16filesystem.h"

  1228 -

  1228 -

  1323 -		throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__);

  1323 -		throw ErrorHandler(UNKNOWNERROR, __FILE__, __LINE__);

  1324 +		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);

  1324 +		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);

  1325  	}

  1325  	}

  1326  }

  1326  }

  1327 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp

  1327 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat32bootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat32bootsector.cpp

  1330 @@ -21,6 +21,7 @@

  1330 @@ -21,6 +21,7 @@

  1331  */

  1331  */

  1332  

  1332  

  1333  #include "fat32bootsector.h"

  1333  #include "fat32bootsector.h"

  1334 +#include <cstring>

  1334 +#include <cstring>

  1335  

  1335  

  1336  /**

  1336  /**

  1337  Constructor of the fat16 boot sector class

  1337  Constructor of the fat16 boot sector class

  1338 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp

  1338 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fat32filesystem.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fat32filesystem.cpp

  1341 @@ -21,6 +21,7 @@

  1341 @@ -21,6 +21,7 @@

  1342  */

  1342  */

  1343  

  1343  

  1344  #include"fat32filesystem.h"

  1344  #include"fat32filesystem.h"

  1345 +#include <cstring>

  1345 +#include <cstring>

  1512 +		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);

  1512 +		throw ErrorHandler(UNKNOWNERROR,__FILE__,__LINE__);

  1513  	}

  1513  	}

  1514  }

  1514  }

  1515  

  1515  

  1516 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp

  1516 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/fatbasebootsector.cpp

  1519 @@ -22,6 +22,7 @@

  1519 @@ -22,6 +22,7 @@

  1520  */

  1520  */

  1521  

  1521  

  1522  #include "fatbasebootsector.h"

  1522  #include "fatbasebootsector.h"

  1523 +#include <cstring>

  1523 +#include <cstring>

  1524  

  1524  

  1525  /**

  1525  /**

  1526  Constructor of the base boot sector class

  1526  Constructor of the base boot sector class

  1527 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp

  1527 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/filesysteminterface.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/filesysteminterface.cpp

  1530 @@ -62,7 +62,7 @@

  1530 @@ -62,7 +62,7 @@

  1531  		iOutputStream.open(aImageFileName,ios::out|ios::binary);

  1531  		iOutputStream.open(aImageFileName,ios::out|ios::binary);

  1532  		if(iOutputStream.fail() == true )

  1532  		if(iOutputStream.fail() == true )

  1533  		{

  1533  		{

  1534 -			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__);

  1534 -			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__, __LINE__);

  1535 +			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__,__LINE__);

  1535 +			throw ErrorHandler(FILEOPENERROR,aImageFileName,__FILE__,__LINE__);

  1536  		}

  1536  		}

  1537  		switch(aFileSystem)

  1537  		switch(aFileSystem)

  1538  		{

  1538  		{

  1539 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/longname.cpp

  1539 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/longname.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/longname.cpp

  1542 @@ -21,6 +21,7 @@

  1542 @@ -21,6 +21,7 @@

  1543  

  1543  

  1544  

  1544  

  1545  #include "longname.h"

  1545  #include "longname.h"

  1546 +#include <cstring>

  1546 +#include <cstring>

  1555 +		throw ErrorHandler(EMPTYFILENAME,__FILE__,__LINE__);

  1555 +		throw ErrorHandler(EMPTYFILENAME,__FILE__,__LINE__);

  1556  	}

  1556  	}

  1557  	FormatLongFileName(iLongName);

  1557  	FormatLongFileName(iLongName);

  1558  	iShortName = GetShortEntryName();

  1558  	iShortName = GetShortEntryName();

  1559 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/messagehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/messagehandler.cpp

  1559 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/messagehandler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/messagehandler.cpp

  1562 @@ -51,7 +51,7 @@

  1562 @@ -51,7 +51,7 @@

  1563  @param aFileName

  1563  @param aFileName

  1564  Name of the Log File

  1564  Name of the Log File

  1565  */

  1565  */

  1566 -void MessageHandler::StartLogging(char *aFileName)

  1566 -void MessageHandler::StartLogging(char *aFileName)

  1576 +void MessageHandler::ReportMessage(int aMsgType, int aMsgIndex,char const* aName)

  1576 +void MessageHandler::ReportMessage(int aMsgType, int aMsgIndex,char const* aName)

  1577  {

  1577  {

  1578  	GetInstance()->ReportMessage(aMsgType,aMsgIndex,aName);

  1578  	GetInstance()->ReportMessage(aMsgType,aMsgIndex,aName);

  1579  }

  1579  }

  1580 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp

  1580 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/filesystem/source/messageimplementation.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/filesystem/source/messageimplementation.cpp

  1583 @@ -23,15 +23,17 @@

  1583 @@ -23,15 +23,17 @@

  1584  

  1584  

  1585  #include "messageimplementation.h"

  1585  #include "messageimplementation.h"

  1586  #include "errorhandler.h"

  1586  #include "errorhandler.h"

  1587 +#include <cstring>

  1587 +#include <cstring>

  1610 +void MessageImplementation::StartLogging(char const *aFileName)

  1610 +void MessageImplementation::StartLogging(char const *aFileName)

  1611  {

  1611  {

  1612  	char logFile[1024];

  1612  	char logFile[1024];

  1613  	FILE *fptr;

  1613  	FILE *fptr;

  1614 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/host/h_utl.cpp

  1614 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/host/h_utl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/host/h_utl.cpp

  1617 @@ -177,7 +177,7 @@

  1617 @@ -177,7 +177,7 @@

  1618  

  1618  

  1619  

  1619  

  1620  	TInt build=0;

  1620  	TInt build=0;

  1621 -	memset(&aVersion, sizeof(TVersion), 0);	

  1621 -	memset(&aVersion, sizeof(TVersion), 0);	

  1631 +	char const * pMinor = strchr(str, '.');

  1631 +	char const * pMinor = strchr(str, '.');

  1632  	if (pMinor)

  1632  	if (pMinor)

  1633  		{

  1633  		{

  1634  		pMinor++; 

  1634  		pMinor++; 

  1635 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/inc/h_utl.h

  1635 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/inc/h_utl.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/inc/h_utl.h

  1638 @@ -65,9 +65,6 @@

  1638 @@ -65,9 +65,6 @@

  1639  #define _stricmp strcasecmp		

  1639  #define _stricmp strcasecmp		

  1640  #define strnicmp strncasecmp	

  1640  #define strnicmp strncasecmp	

  1641  

  1641  

  1642 -// to fix the linux problem: memcpy does not work with overlapped areas.

  1642 -// to fix the linux problem: memcpy does not work with overlapped areas.

  1644 -

  1644 -

  1645  // hand-rolled strupr function for converting a string to all uppercase

  1645  // hand-rolled strupr function for converting a string to all uppercase

  1646  char* strupr(char *a);

  1646  char* strupr(char *a);

  1647  

  1647  

  1648 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp

  1648 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/imglib/parameterfileprocessor/source/parameterfileprocessor.cpp

  1651 @@ -21,6 +21,7 @@

  1651 @@ -21,6 +21,7 @@

  1652  

  1652  

  1653  

  1653  

  1654  #include "parameterfileprocessor.h"

  1654  #include "parameterfileprocessor.h"

  1655 +#include <cstring>

  1655 +#include <cstring>

  1656  

  1656  

  1657  

  1657  

  1658  /**

  1658  /**

  1659 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/group/BLD.INF

  1659 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/group/BLD.INF /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/group/BLD.INF

  1662 @@ -15,13 +15,14 @@

  1662 @@ -15,13 +15,14 @@

  1663  *

  1663  *

  1664  */

  1664  */

  1665  

  1665  

  1666 +#include <productvariant.hrh>

  1666 +#include <productvariant.hrh>

  1674 +../maksym/fixupsym.bat              EPOCROOT_EXPORT_PATH(epoc32/tools/fixupsym.bat)

  1674 +../maksym/fixupsym.bat              EPOCROOT_EXPORT_PATH(epoc32/tools/fixupsym.bat)

  1675  ../maksym/hpsym.bat                 /epoc32/tools/hpsym.bat

  1675  ../maksym/hpsym.bat                 /epoc32/tools/hpsym.bat

  1676  ../maksym/maksym.bat                /epoc32/tools/maksym.bat

  1676  ../maksym/maksym.bat                /epoc32/tools/maksym.bat

  1677  ../maksym/maksymrofs.bat            /epoc32/tools/maksymrofs.bat

  1677  ../maksym/maksymrofs.bat            /epoc32/tools/maksymrofs.bat

  1678 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/group/readimage.mmp

  1678 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/group/readimage.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/group/readimage.mmp

  1681 @@ -45,15 +45,16 @@

  1681 @@ -45,15 +45,16 @@

  1682  userinclude     ..\..\imglib\compress 

  1682  userinclude     ..\..\imglib\compress 

  1683  userinclude		..\..\imglib\patchdataprocessor\include

  1683  userinclude		..\..\imglib\patchdataprocessor\include

  1684  userinclude		..\..\sisutils\inc

  1684  userinclude		..\..\sisutils\inc

  1685 +#ifndef TOOLS2_LINUX

  1685 +#ifndef TOOLS2_LINUX

  1696 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  1696 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  1697  #else

  1697  #else

  1698  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  1698  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  1699  OPTION    GCC -mthreads -O2 -Wno-uninitialized

  1699  OPTION    GCC -mthreads -O2 -Wno-uninitialized

  1700 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/common.h

  1700 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/common.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/common.h

  1703 @@ -46,7 +46,7 @@

  1703 @@ -46,7 +46,7 @@

  1704  #define DLL_UID1	10000079

  1704  #define DLL_UID1	10000079

  1705  #define EXE_UID1	1000007a

  1705  #define EXE_UID1	1000007a

  1706  

  1706  

  1707 -typedef enum EImageType

  1707 -typedef enum EImageType

  1718 +ostream& DumpInHex(char const * aDesc, TUint32 aData, bool aContinue = false,

  1718 +ostream& DumpInHex(char const * aDesc, TUint32 aData, bool aContinue = false,

  1719 +			TUint aDataWidth=8, char aFiller='0', TUint aMaxDescWidth=28);

  1719 +			TUint aDataWidth=8, char aFiller='0', TUint aMaxDescWidth=28);

  1720  

  1720  

  1721  #endif //__IMAGE_READER_COMMON_H_

  1721  #endif //__IMAGE_READER_COMMON_H_

  1722 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/image_reader.h

  1722 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/image_reader.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/image_reader.h

  1725 @@ -27,7 +27,19 @@

  1725 @@ -27,7 +27,19 @@

  1726  

  1726  

  1727  

  1727  

  1728  #include "common.h"

  1728  #include "common.h"

  1729 -#include <direct.h>

  1729 -#include <direct.h>

  1742 +

  1742 +

  1743  #include <map>

  1743  #include <map>

  1744  

  1744  

  1745  typedef struct tag_FILEINFO

  1745  typedef struct tag_FILEINFO

  1746 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h

  1746 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/inc/rofs_image_reader.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/inc/rofs_image_reader.h

  1749 @@ -65,10 +65,10 @@

  1749 @@ -65,10 +65,10 @@

  1750  	void DumpDirStructure();

  1750  	void DumpDirStructure();

  1751  	void DumpFileAttributes();

  1751  	void DumpFileAttributes();

  1752  	void MarkNodes();

  1752  	void MarkNodes();

  1753 -	void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg);

  1753 -	void SetSeek(streampos aOff, ios::seek_dir aStartPos=ios::beg);

  1758 +	void GetCompleteNodePath(TRomNode* aNode,string& aName,char const* aAppStr);

  1758 +	void GetCompleteNodePath(TRomNode* aNode,string& aName,char const* aAppStr);

  1759  	void WriteEntryToFile(char* aFileName,TRomNode* aNode,ofstream& aLogFile);

  1759  	void WriteEntryToFile(char* aFileName,TRomNode* aNode,ofstream& aLogFile);

  1760  

  1760  

  1761  	void GetFileInfo(FILEINFOMAP &aFileMap);

  1761  	void GetFileInfo(FILEINFOMAP &aFileMap);

  1762 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/common.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/common.cpp

  1762 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/common.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/common.cpp

  1765 @@ -40,7 +40,7 @@

  1765 @@ -40,7 +40,7 @@

  1766  	*out << "Usage Error:" << iErrMessage.c_str() << endl;

  1766  	*out << "Usage Error:" << iErrMessage.c_str() << endl;

  1767  }

  1767  }

  1768  

  1768  

  1769 -ostream& DumpInHex(char* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \

  1769 -ostream& DumpInHex(char* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \

  1770 +ostream& DumpInHex(char const* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \

  1770 +ostream& DumpInHex(char const* aDesc, TUint32 aData, bool aContinue, TUint aDataWidth, \

  1771  				   char aFiller, TUint aMaxDescWidth)

  1771  				   char aFiller, TUint aMaxDescWidth)

  1772  {

  1772  {

  1773  	TUint aDescLen = strlen(aDesc);

  1773  	TUint aDescLen = strlen(aDesc);

  1774 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp

  1774 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/e32_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/e32_image_reader.cpp

  1777 @@ -75,26 +75,26 @@

  1777 @@ -75,26 +75,26 @@

  1778  	bool aContinue = true;

  1778  	bool aContinue = true;

  1779  

  1779  

  1780  	DumpInHex("Size", aE32Image.iSize ) << endl;

  1780  	DumpInHex("Size", aE32Image.iSize ) << endl;

  1781 -	DumpInHex("Uids",aE32Image.iOrigHdr->iUid1);

  1781 -	DumpInHex("Uids",aE32Image.iOrigHdr->iUid1);

  1817 +	DumpInHex("Flags", aE32Image.iOrigHdr->iFlags) << endl;

  1817 +	DumpInHex("Flags", aE32Image.iOrigHdr->iFlags) << endl;

  1818  

  1818  

  1819  	TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags);

  1819  	TUint aHeaderFmt = E32ImageHeader::HdrFmtFromFlags(aE32Image.iOrigHdr->iFlags);

  1820  

  1820  

  1821 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/image_handler.cpp

  1821 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/image_handler.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/image_handler.cpp

  1824 @@ -392,7 +392,7 @@

  1824 @@ -392,7 +392,7 @@

  1825  	{

  1825  	{

  1826  		if(iInputFileName.empty())

  1826  		if(iInputFileName.empty())

  1827  		{

  1827  		{

  1828 -			throw SisUtilsException("Usage Error", "No SIS file passed");

  1828 -			throw SisUtilsException("Usage Error", "No SIS file passed");

  1838 +			throw SisUtilsException("Error:","Cannot create Sis2Iby object");

  1838 +			throw SisUtilsException("Error:","Cannot create Sis2Iby object");

  1839  		}

  1839  		}

  1840  	}

  1840  	}

  1841  }

  1841  }

  1842 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/image_reader.cpp

  1842 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/image_reader.cpp

  1845 @@ -173,7 +173,7 @@

  1845 @@ -173,7 +173,7 @@

  1846  

  1846  

  1847  

  1847  

  1848  	// get the current working directory and store in buffer.

  1848  	// get the current working directory and store in buffer.

  1849 -	if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL )

  1849 -	if( _getcwd(currWorkingDir,_MAX_BUFFER_SIZE_) == NULL )

  1889 +		int r = CHDIR(currWorkingDir); (void)r;

  1889 +		int r = CHDIR(currWorkingDir); (void)r;

  1890  		// replace the source path with the original path information.

  1890  		// replace the source path with the original path information.

  1891  		strcpy(aSrcPath,origPath.c_str());

  1891  		strcpy(aSrcPath,origPath.c_str());

  1892  		delete[] currWorkingDir;

  1892  		delete[] currWorkingDir;

  1893 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp

  1893 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/rofs_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/rofs_image_reader.cpp

  1896 @@ -42,7 +42,7 @@

  1896 @@ -42,7 +42,7 @@

  1897  	delete iImageReader;

  1897  	delete iImageReader;

  1898  }

  1898  }

  1899  

  1899  

  1900 -void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos)

  1900 -void RofsImageReader::SetSeek(streampos aOff, ios::seek_dir aStartPos)

  1938 +					GetCompleteNodePath( currNode, fileName,DIR_SEPARATOR );

  1938 +					GetCompleteNodePath( currNode, fileName,DIR_SEPARATOR );

  1939  				}

  1939  				}

  1940  			}

  1940  			}

  1941  			else

  1941  			else

  1942 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp

  1942 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/readimage/src/rom_image_reader.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/readimage/src/rom_image_reader.cpp

  1945 @@ -20,6 +20,12 @@

  1945 @@ -20,6 +20,12 @@

  1946  #include <e32rom.h>

  1946  #include <e32rom.h>

  1947  #include "rom_image_reader.h"

  1947  #include "rom_image_reader.h"

  1948  #include "r_rom.h"

  1948  #include "r_rom.h"

  1949 +#if defined(WIN32)

  1949 +#if defined(WIN32)

  1974 +	DumpInHex(" DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;

  1974 +	DumpInHex(" DataSize=", (aRomImgEntry->iBssSize + aRomImgEntry->iDataSize), true) << endl;

  1975  	

  1975  	

  1976  }

  1976  }

  1977  

  1977  

  1978 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_build.cpp

  1978 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_build.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_build.cpp

  1981 @@ -29,7 +29,7 @@

  1981 @@ -29,7 +29,7 @@

  1982  

  1982  

  1983  #if defined(__MSVCDOTNET__) || defined(__TOOLS2__)

  1983  #if defined(__MSVCDOTNET__) || defined(__TOOLS2__)

  1984  	#include <iomanip>

  1984  	#include <iomanip>

  1985 -	#include <strstream>

  1985 -	#include <strstream>

  2029 +			size = os.str().size();

  2029 +			size = os.str().size();

  2030  			compression = f.iHdr->CompressionType();

  2030  			compression = f.iHdr->CompressionType();

  2031  			memcpy(&iUids[0], aDest, sizeof(iUids));

  2031  			memcpy(&iUids[0], aDest, sizeof(iUids));

  2032  			}

  2032  			}

  2033 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp

  2033 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_coreimage.cpp

  2036 @@ -305,7 +305,7 @@

  2036 @@ -305,7 +305,7 @@

  2037  @param aInfo Used by the caller to identify where the error occurred.

  2037  @param aInfo Used by the caller to identify where the error occurred.

  2038  @return Error number. KErrNone is returned if there are no errors.

  2038  @return Error number. KErrNone is returned if there are no errors.

  2039  */

  2039  */

  2040 -TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char *aInfo)

  2040 -TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char *aInfo)

  2041 +TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char const *aInfo)

  2041 +TInt RCoreImageReader::ImageError(int aItemsRead, int aExpected, char const *aInfo)

  2042  	{

  2042  	{

  2043  	if (aItemsRead != aExpected)

  2043  	if (aItemsRead != aExpected)

  2044  		{

  2044  		{

  2045 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_coreimage.h

  2045 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_coreimage.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_coreimage.h

  2048 @@ -103,7 +103,7 @@

  2048 @@ -103,7 +103,7 @@

  2049  	TText* Filename();

  2049  	TText* Filename();

  2050  private:

  2050  private:

  2051  	TInt ReadIdentifier();

  2051  	TInt ReadIdentifier();

  2052 -	TInt ImageError(int aBytesRead, int aExpected, char* aInfo);

  2052 -	TInt ImageError(int aBytesRead, int aExpected, char* aInfo);

  2053 +	TInt ImageError(int aBytesRead, int aExpected, char const* aInfo);

  2053 +	TInt ImageError(int aBytesRead, int aExpected, char const* aInfo);

  2054  

  2054  

  2055  	/** Image type of the file being read */

  2055  	/** Image type of the file being read */

  2056  	TImageType iImageType;

  2056  	TImageType iImageType;

  2057 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp

  2057 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveimage.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveimage.cpp

  2060 @@ -254,7 +254,7 @@

  2060 @@ -254,7 +254,7 @@

  2061  	fileName.append("/");

  2061  	fileName.append("/");

  2062  

  2062  

  2063  	// Go through each entry

  2063  	// Go through each entry

  2064 -	while(dirEntry = readdir(dirHandler))

  2064 -	while(dirEntry = readdir(dirHandler))

  2065 +	while((dirEntry = readdir(dirHandler)) != NULL)

  2065 +	while((dirEntry = readdir(dirHandler)) != NULL)

  2066  		{

  2066  		{

  2067  		if(dirEntry->d_type != DT_DIR) 

  2067  		if(dirEntry->d_type != DT_DIR) 

  2068  			{

  2068  			{

  2069 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp

  2069 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveutl.cpp

  2072 @@ -82,7 +82,7 @@

  2072 @@ -82,7 +82,7 @@

  2073  /**

  2073  /**

  2074  Time Stamp for Log file.

  2074  Time Stamp for Log file.

  2075  */ 

  2075  */ 

  2076 -TAny GetLocalTime(TAny)

  2076 -TAny GetLocalTime(TAny)

  2077 +TAny GetLocalTime()

  2077 +TAny GetLocalTime()

  2078  	{

  2078  	{

  2079  	struct tm *aNewTime = NULL;

  2079  	struct tm *aNewTime = NULL;

  2080  	time_t aTime = 0;

  2080  	time_t aTime = 0;

  2081 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h

  2081 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_driveutl.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_driveutl.h

  2084 @@ -24,6 +24,6 @@

  2084 @@ -24,6 +24,6 @@

  2085  #include <e32def.h>

  2085  #include <e32def.h>

  2086  

  2086  

  2087  TInt Getlogfile(TText *aDriveObeyFileName,TText* &aPadLogFile);

  2087  TInt Getlogfile(TText *aDriveObeyFileName,TText* &aPadLogFile);

  2088 -TAny GetLocalTime(TAny);

  2088 -TAny GetLocalTime(TAny);

  2089 +TAny GetLocalTime();

  2089 +TAny GetLocalTime();

  2090  

  2090  

  2091  #endif

  2091  #endif

  2092 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp

  2092 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_obey.cpp

  2095 @@ -47,6 +47,7 @@

  2095 @@ -47,6 +47,7 @@

  2096  #include <time.h>

  2096  #include <time.h>

  2097  #include <assert.h>

  2097  #include <assert.h>

  2098  #include <errno.h>

  2098  #include <errno.h>

  2099 +#include <limits.h>

  2099 +#include <limits.h>

  2123 +			istringstream val(iReader.Word(1),ios_base::in|ios_base::out);	  

  2123 +			istringstream val(iReader.Word(1),ios_base::in|ios_base::out);	  

  2124  			  iReader.CopyWord(1, coreImageFileName);

  2124  			  iReader.CopyWord(1, coreImageFileName);

  2125  			  iReader.MarkNext(); // ready for processing extension

  2125  			  iReader.MarkNext(); // ready for processing extension

  2126  			  break;

  2126  			  break;

  2127 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp

  2127 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/rofsbuild.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/rofsbuild.mmp

  2130 @@ -43,15 +43,16 @@

  2130 @@ -43,15 +43,16 @@

  2131  USERINCLUDE   ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include 

  2131  USERINCLUDE   ../../imglib/inc ../../imglib/compress ../../imglib/filesystem/include 

  2132  USERINCLUDE   ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include

  2132  USERINCLUDE   ../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include

  2133  USERINCLUDE	  ../../imglib/memmap/include

  2133  USERINCLUDE	  ../../imglib/memmap/include

  2134 +#ifndef TOOLS2_LINUX

  2134 +#ifndef TOOLS2_LINUX

  2145 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  2145 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  2146  #else

  2146  #else

  2147  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  2147  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  2148  OPTION    GCC -mthreads -O2 -Wno-uninitialized

  2148  OPTION    GCC -mthreads -O2 -Wno-uninitialized

  2149 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp

  2149 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rofsbuild/r_rofs.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rofsbuild/r_rofs.cpp

  2152 @@ -584,9 +584,10 @@

  2152 @@ -584,9 +584,10 @@

  2153  			coffhead[0x54] = 0x20;

  2153  			coffhead[0x54] = 0x20;

  2154  

  2154  

  2155  			// now fill in the text segment size

  2155  			// now fill in the text segment size

  2156 -			*(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed);

  2156 -			*(TUint32 *) (&coffhead[0x18]) = ALIGN4K(iSizeUsed);

  2162 +			*p0x40 = ALIGN4K(iSizeUsed);

  2162 +			*p0x40 = ALIGN4K(iSizeUsed);

  2163  			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));

  2163  			os.write(reinterpret_cast<char *>(coffhead), sizeof(coffhead));

  2164  			}

  2164  			}

  2165  		break;

  2165  		break;

  2166 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_areaset.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_areaset.cpp

  2166 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_areaset.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_areaset.cpp

  2169 @@ -47,7 +47,7 @@

  2169 @@ -47,7 +47,7 @@

  2170  Area::~Area()

  2170  Area::~Area()

  2171  	{

  2171  	{

  2172  	ReleaseAllFiles();

  2172  	ReleaseAllFiles();

  2173 -	free(const_cast<char*>(iName));	// allocated with strdup()

  2173 -	free(const_cast<char*>(iName));	// allocated with strdup()

  2174 +	free(iName);	// allocated with strdup()

  2174 +	free(iName);	// allocated with strdup()

  2175  	}

  2175  	}

  2176  

  2176  

  2177  

  2177  

  2178 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_areaset.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_areaset.h

  2178 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_areaset.h /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_areaset.h

  2181 @@ -104,7 +104,7 @@

  2181 @@ -104,7 +104,7 @@

  2182  public:

  2182  public:

  2183  	TRomBuilderEntry* iFirstPagedCode; // For PagedRom only

  2183  	TRomBuilderEntry* iFirstPagedCode; // For PagedRom only

  2184  private:

  2184  private:

  2185 -	const char* iName;

  2185 -	const char* iName;

  2186 +	char* iName;

  2186 +	char* iName;

  2187  	TLinAddr iDestBaseAddr;

  2187  	TLinAddr iDestBaseAddr;

  2188  	TLinAddr iSrcBaseAddr;

  2188  	TLinAddr iSrcBaseAddr;

  2189  	TLinAddr iSrcLimitAddr;

  2189  	TLinAddr iSrcLimitAddr;

  2190 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_obey.cpp

  2190 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_obey.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_obey.cpp

  2193 @@ -301,7 +301,7 @@

  2193 @@ -301,7 +301,7 @@

  2194  	iCurrentLine++;

  2194  	iCurrentLine++;

  2195  	iCurrentMark = ftell(iObeyFile);

  2195  	iCurrentMark = ftell(iObeyFile);

  2196  	iLine[0]='\0';

  2196  	iLine[0]='\0';

  2197 -	fgets((char*)iLine,imaxLength+1,iObeyFile);

  2197 -	fgets((char*)iLine,imaxLength+1,iObeyFile);

  2213 +			istringstream val(iReader.Word(1),ios_base::in|ios_base::out);

  2213 +			istringstream val(iReader.Word(1),ios_base::in|ios_base::out);

  2214  			iReader.CopyWord(1, coreImageFileName);

  2214  			iReader.CopyWord(1, coreImageFileName);

  2215  			break;

  2215  			break;

  2216  		}

  2216  		}

  2217 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/rombuild.mmp

  2217 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/rombuild.mmp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/rombuild.mmp

  2220 @@ -41,7 +41,9 @@

  2220 @@ -41,7 +41,9 @@

  2221  userinclude	../../imglib/compress 	../../imglib/inc 

  2221  userinclude	../../imglib/compress 	../../imglib/inc 

  2222  userinclude	../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include

  2222  userinclude	../../imglib/patchdataprocessor/include ../../imglib/parameterfileprocessor/include

  2223  userinclude ../../imglib/memmap/include

  2223  userinclude ../../imglib/memmap/include

  2224 +#ifndef TOOLS2_LINUX

  2224 +#ifndef TOOLS2_LINUX

  2236 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  2236 +OPTION    GCC -pthread -O2 -Wno-uninitialized -lboost_thread-mt

  2237  #else

  2237  #else

  2238  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  2238  STATICLIBRARY   boost_thread-mgw34-mt-1_39_win32

  2239  OPTION    GCC -O2 -Wno-uninitialized -mthreads

  2239  OPTION    GCC -O2 -Wno-uninitialized -mthreads

  2240 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_rom.cpp

  2240 diff -u -r -b -B -E -x '*.hg*' -x '*cross-plat-dev-utils*' -x '*baseline.txt' -x '*README' -x '*TODO' -x '*NEWS' -x '*.pyc' -x '*~' -x '*linux-unknown-libc2_11*' /home/imk/symbian/epocroot-pdk-3.0.i/latest_build/build/imgtools/romtools/rombuild/r_rom.cpp /home/imk/symbian/epocroot-pdk-3.0.i/linux_build/imgtools/romtools/rombuild/r_rom.cpp

  2243 @@ -1835,7 +1835,7 @@

  2243 @@ -1835,7 +1835,7 @@

  2244  			TRomFile** l=rf->iPDeps;

  2244  			TRomFile** l=rf->iPDeps;

  2245  			FindMarked(MARK_EXE, MARK_EXE, l);

  2245  			FindMarked(MARK_EXE, MARK_EXE, l);

  2246  			TInt nx=l-rf->iPDeps;

  2246  			TInt nx=l-rf->iPDeps;

  2247 -			if (!e->IsDll() && (nx>1 || nx==1 && l[-1]!=rf))