Modified by:ameza at dextratech.com, eluevano at dextratech.com
Date:4/6/2005
Project:Helix Symbian Port


Synopsis:	Remove "unused variables", "multiline commented", "defined but not
used" and other warnings
Overview: This patch contains some patches which have been previously merged
150_Cayenne
Branch: HEAD


Copyright assignment:
I agree to assign to RealNetworks full copyright ownership of the code
represented by the attached patch. I warrant that I am legally entitled to
grant the copyright assignment and that my contribution does not violate any
law or breach any contract. I understand that RealNetworks may license this
code under RPSL, RCSL, and/or any other license at RealNetworks' sole
discretion.


Index: fileio/chunkres.cpp
===================================================================
RCS file: /cvsroot/common/fileio/chunkres.cpp,v
retrieving revision 1.22
diff -u -w -r1.22 chunkres.cpp
--- fileio/chunkres.cpp	24 Mar 2005 00:02:23 -0000	1.22
+++ fileio/chunkres.cpp	5 Apr 2005 23:55:18 -0000
@@ -1130,7 +1130,8 @@
 			delete pChunk;
 		}
 	}
-	HX_RESULT theErr = DiscardDiskData();
+	HX_RESULT theErr = HXR_OK;
+		theErr = DiscardDiskData();
 	HX_ASSERT(theErr == HXR_OK);

 	if(m_ChunksMemoryMRU)
@@ -1903,7 +1904,9 @@
 //
 CChunkyResChunk::~CChunkyResChunk()
 {
-	HX_RESULT theErr = DiscardDiskData();
+
+	HX_RESULT theErr = HXR_OK;
+	theErr = DiscardDiskData();
 	HX_ASSERT(theErr == HXR_OK);

 	if (m_pChunkData)
Index: fileio/platform/win/filespec.cpp
===================================================================
RCS file: /cvsroot/common/fileio/platform/win/filespec.cpp,v
retrieving revision 1.5
diff -u -w -r1.5 filespec.cpp
--- fileio/platform/win/filespec.cpp	14 Mar 2005 19:36:30 -0000	1.5
+++ fileio/platform/win/filespec.cpp	5 Apr 2005 23:55:18 -0000
@@ -149,20 +149,19 @@
 	nStart = 0;
     }

-    // now, break the rest of the path up into components based on slashes
-    // Here is an example of how the path will be broken up.  The carats
point
-    // to the start of each component.  The separator length will be the
-    // number of slashes following the carat, and the name will be the
remaining
-    // characters in that component.
-    //
-    // \\hostname\bla\bla\bla\file.txt
-    // ^         ^   ^   ^   ^
-    //
-    // In the case of a trailing slash:
-    //
-    // \bla\bla\
-    // ^   ^   ^
-    //
+    /* now, break the rest of the path up into components based on slashes
+     Here is an example of how the path will be broken up.  The carats
point
+     to the start of each component.  The separator length will be the
+     number of slashes following the carat, and the name will be the
remaining
+     characters in that component.
+
+     \\hostname\bla\bla\bla\file.txt
+     ^         ^   ^   ^   ^
+
+     In the case of a trailing slash:
+
+     \bla\bla\
+     ^   ^   ^																*/

     int anStart[MAX_PATH_COMPONENTS];
     int anSeparatorLen[MAX_PATH_COMPONENTS];
@@ -248,19 +247,19 @@
 	}


-	// now that we have dealt with all possible volumes, nStart points to the
first component in the
-	// actual path.  There are still several possibilities:
-	//
-	// "" [i.e. no more components]
-	// \
-	// bla\
-	// bla.txt
-	// bla\bla.txt
-	// \bla\
-	// \bla.txt
-	// \bla\bla.txt
+	/* now that we have dealt with all possible volumes, nStart points to the
first component in the
+	 actual path.  There are still several possibilities:
+
+	 "" [i.e. no more components]
+	  \
+	  bla\
+	  bla.txt
+	  bla\bla.txt
+	  \bla\
+	  \bla.txt
+	  \bla\bla.txt

-	// these cannot be files: "", "bla\", "\bla\bla\"
+	these cannot be files: "", "bla\", "\bla\bla\"  */

 	if(nNumComponents == nStart || anNameLen[nNumComponents - 1] == 0)
 	    m_bCannotBeFile = TRUE;
Index: util/cpuident.c
===================================================================
RCS file: /cvsroot/common/util/cpuident.c,v
retrieving revision 1.16
diff -u -w -r1.16 cpuident.c
--- util/cpuident.c	8 Dec 2004 18:10:33 -0000	1.16
+++ util/cpuident.c	5 Apr 2005 23:16:32 -0000
@@ -56,7 +56,7 @@
  * returns: 1 if support, 0 else
  */

-static int hasCPUID(void)
+int hasCPUID(void)
 {
     int has_cpuid = 0 ;

@@ -206,7 +206,7 @@
 }
 #endif

-static int bOSHasSSEsupport(void)
+int bOSHasSSEsupport(void)
 {
 #if defined(_WIN32) && defined(_M_IX86)
     int bSSE = 1 ;
Index: util/hxabdutil.cpp
===================================================================
RCS file: /cvsroot/common/util/hxabdutil.cpp,v
retrieving revision 1.4
diff -u -w -r1.4 hxabdutil.cpp
--- util/hxabdutil.cpp	25 Jan 2005 17:12:43 -0000	1.4
+++ util/hxabdutil.cpp	5 Apr 2005 21:55:39 -0000
@@ -199,7 +199,6 @@
     {
         if ((pProbPktInfo[i]->seq - pProbPktInfo[i-1]->seq) == 1)
         {
-            double sendGap = (double)(pProbPktInfo[i]->sendTime -
pProbPktInfo[i-1]->sendTime)/1000000.0;
             double recvGap = (double)(pProbPktInfo[i]->recvTime -
pProbPktInfo[i-1]->recvTime)/1000000.0;

             dwGap = recvGap;
Index: util/hxinfcod.cpp
===================================================================
RCS file: /cvsroot/common/util/hxinfcod.cpp,v
retrieving revision 1.8
diff -u -w -r1.8 hxinfcod.cpp
--- util/hxinfcod.cpp	14 Mar 2005 19:36:39 -0000	1.8
+++ util/hxinfcod.cpp	5 Apr 2005 23:20:26 -0000
@@ -69,7 +69,7 @@


 /////////////////////////////////////////////////////////////////////
-static UINT16 	FourByteAlign(UINT16 number)
+UINT16 	FourByteAlign(UINT16 number)
 {
 	return( ((number+3)>>2)<<2 );
 }
Index: util/hxsmutil.cpp
===================================================================
RCS file: /cvsroot/common/util/hxsmutil.cpp,v
retrieving revision 1.2
diff -u -w -r1.2 hxsmutil.cpp
--- util/hxsmutil.cpp	14 Mar 2005 19:36:39 -0000	1.2
+++ util/hxsmutil.cpp	5 Apr 2005 21:55:39 -0000
@@ -212,7 +212,6 @@
 					float* pThreshold,
 					REF(UINT32) ulNumThreshold)
 {
-    IHXBuffer* pASMMasterRuleBookBuffer = NULL;
     HX_RESULT retVal = HXR_OK;

     if ((pSourceHeaders == NULL) ||
Index: util/hxurl.cpp
===================================================================
RCS file: /cvsroot/common/util/hxurl.cpp,v
retrieving revision 1.40
diff -u -w -r1.40 hxurl.cpp
--- util/hxurl.cpp	1 Apr 2005 19:12:16 -0000	1.40
+++ util/hxurl.cpp	5 Apr 2005 21:55:39 -0000
@@ -642,7 +642,6 @@
         char* pFirstChar    = strURLWork.GetBuffer(strURLWork.GetLength());
         char* pLastChar     = NULL;
         char* pOptions      = NULL;
-        char* pFragment     = NULL;

         pOptions = strchr(pFirstChar, '?');

Index: util/timerep.cpp
===================================================================
RCS file: /cvsroot/common/util/timerep.cpp,v
retrieving revision 1.14
diff -u -w -r1.14 timerep.cpp
--- util/timerep.cpp	14 Mar 2005 19:36:39 -0000	1.14
+++ util/timerep.cpp	5 Apr 2005 22:03:36 -0000
@@ -481,9 +481,9 @@
     if (ptm != NULL)
     {
 #if defined(_WIN16) || defined(WIN32_PLATFORM_PSPC)
-        if (strftime16(m_szTime, MAX_UTC_TIME_LEN, "%A, %d-%b-%y %H:%M:%S
GMT", ptm) == 0)
+        if (strftime16(m_szTime, MAX_UTC_TIME_LEN, "%A, %d-%b-%Y %H:%M:%S
GMT", ptm) == 0)
 #else
-        if (strftime(m_szTime, MAX_UTC_TIME_LEN, "%A, %d-%b-%y %H:%M:%S
GMT", ptm) == 0)
+        if (strftime(m_szTime, MAX_UTC_TIME_LEN, "%A, %d-%b-%Y %H:%M:%S
GMT", ptm) == 0)
 #endif
         {
             m_szTime[0] = '\0';
Index: netio/pub/platform/mac/sockio.h
===================================================================
RCS file: /cvsroot/common/netio/pub/platform/mac/sockio.h,v
retrieving revision 1.7
diff -u -w -r1.7 sockio.h
--- netio/pub/platform/mac/sockio.h	14 Mar 2005 19:36:36 -0000	1.7
+++ netio/pub/platform/mac/sockio.h	5 Apr 2005 23:55:21 -0000
@@ -63,7 +63,7 @@
 class SockFd;

 #ifndef INADDR_NONE
-#define INADDR_NONE (-1)
+#define INADDR_NONE (0xffffffff)
 #endif /* ndef INADDR_NONE */

 class mIO {
-------------- next part --------------
A non-text attachment was scrubbed...
Name: commonHeadOnly.patch
Type: application/octet-stream
Size: 7178 bytes
Desc: not available
Url : http://lists.helixcommunity.org/pipermail/common-dev/attachments/20050406/2f7d669c/commonHeadOnly-0001.obj