[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-filesystem-dev
Subject:    [Filesystem-dev] Re: [Client-dev] CR:Build error for http file
From:       Greg Wright <gwright () real ! com>
Date:       2008-02-12 18:18:33
Message-ID: 47B1E2F9.6000701 () real ! com
[Download RAW message or body]

No need to CC anything except the filesystem-dev list here. We try to
keep the amount of cross-posting down.

Index: httpfsys.cpp
===================================================================
RCS file: /cvsroot/filesystem/http/httpfsys.cpp,v
retrieving revision 1.88.2.3
diff -w -u -b -r1.88.2.3 httpfsys.cpp
@@ -1755,12 +1755,16 @@
      HXScopeLock lock(m_pMutex);

      HX_RESULT           lResult      = HXR_OK;
+#if !defined(HELIX_CONFIG_NOSTATICS)
      static UINT32       ulReadCount  = 0;
+#endif
      HX_RESULT           lSocketReadResult = HXR_OK;
      UINT32              ulCurrentContig = 0;

+#if !defined(HELIX_CONFIG_NOSTATICS)
      HXLOGL3(HXLOG_HTTP, "Read #%03lu, Pos is %lu, Size is %4lu, Recurs is %2u, \
                FileObj is '%s'",
              ++ulReadCount, m_ulCurrentReadPosition, ulCount, m_ulRecursionCount + \
1, NULLOK(m_pFilename)); +#endif


I like this change better:


Index: httpfsys.cpp
===================================================================
RCS file: /cvsroot/filesystem/http/httpfsys.cpp,v
retrieving revision 1.109.2.6
diff -u -w -r1.109.2.6 httpfsys.cpp
--- httpfsys.cpp        18 Jan 2008 20:47:18 -0000      1.109.2.6
+++ httpfsys.cpp        12 Feb 2008 18:15:12 -0000
@@ -1710,12 +1710,14 @@
      HXScopeLock lock(m_pMutex);

      HX_RESULT           lResult      = HXR_OK;
-    static UINT32       ulReadCount  = 0;
      HX_RESULT           lSocketReadResult = HXR_OK;
      UINT32              ulCurrentContig = 0;

+#if !defined(HELIX_CONFIG_NOSTATICS)
+    static UINT32       ulReadCount  = 0;
      HXLOGL3(HXLOG_HTTP, "Read #%03lu, Pos is %lu, Size is %4lu, Recurs is %2u, \
                FileObj is '%s'",
              ++ulReadCount, m_ulCurrentReadPosition, ulCount, m_ulRecursionCount + \
1, NULLOK(m_pFilename)); +#endif

      if (m_LastError)
      {


Do you also need it on the new branch?
--greg.


Praveen.Thimmashetty@nokia.com wrote:
> 
> "Nokia submits this code under the terms of a commercial contribution 
> agreement with Real Networks, and I am authorized to contribute this 
> code under said agreement."
> 
> Modified by:  Praveen.Thimmashetty@nokia.com
> 
> Reviewed by:
> 
> Date: 12-February-2008
> 
> Project: SymbianMmf
> 
> ErrorId***:* SUB 409-795
> 
> 
> Synopsis:  CR:Build error for http file system for ARMV5 UDEB target
> Updated to remove initialized data.
> 
> Root Cause of the problem: Implementation
> 
> Files Modified:
> filesystem\http\httpfsys.cpp
> 
> New files added:
> None.
> 
> 
> Image Size and Heap Use impact: no major impact
> 
> Module Release testing (STIF) :  Passed.
> 
> Test case(s) Added  :  No.
> 
> Memory leak check performed : Yes.  No new leaks introduced.
> 
> Platforms and Profiles Build Verified:
> helix-client-s60-32-mmf-mdf-arm
> 
> Platforms and Profiles Functionality verified: armv5,winscw
> 
> Branch: hxclient_2_1_0_cayennes & HEAD
> 
> <<diff.txt>>
> 
> 
> ------------------------------------------------------------------------
> 
> _______________________________________________
> Client-dev mailing list
> Client-dev@helixcommunity.org
> http://lists.helixcommunity.org/mailman/listinfo/client-dev


_______________________________________________
Filesystem-dev mailing list
Filesystem-dev@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/filesystem-dev


[prev in list] [next in list] [prev in thread] [next in thread]