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

List:       helix-server-cvs
Subject:    [Server-cvs] fs/adminfs browse.h,1.4,1.5
From:       svaidhya () helixcommunity ! org
Date:       2011-01-30 23:57:24
Message-ID: 201101302357.p0UNvAnf008116 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/fs/adminfs
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv4004

Modified Files:
	browse.h 
Log Message:
Synopsis
=======
CR: Fix for Bug 269289: file size reported incorrectly with Admin's Content Browser 

Branches:  HEAD, 14.2
Reviewer: Dean, Chytanya

Description
=========

The filesize returned by the filesystem is of type HX_OFF_T (INT64 ) and we truncate \
it to UINT32. Modified the function to handle UINT64 filesize. 
Also the filesize was written into a char buffer using sprintf. Since we changed to \
UINT64, changed the format specifier to unsigned long long.

Also corrected modified time wihle at it
Added License header in browse_format.cpp

Files Affected
===========
./server/fs/adminfs/browse.h
./server/fs/adminfs/browse_format.cpp

Testing Performed
==============
Unit Tests:
- None

Integration Tests:
- Verified that the filesize is displayed as expected in the browse_content section \
and viewsource of the admin system
** With windows it still was not showing correctly despite the fix. Then realized \
JJ's fix for using _stat64 would fix this too. Checking out latestcode and compiling.
Will checkin after testing on  Windows.

Leak Tests:
- None

Performance Tests:
- None

Build verified:linux-rhel5-x86_64, win-x86_64--vc10
Platform tested :linux-rhel5-x86_64, win-x86_64--vc10







Index: browse.h
===================================================================
RCS file: /cvsroot/server/fs/adminfs/browse.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- browse.h	14 Sep 2010 17:00:58 -0000	1.4
+++ browse.h	30 Jan 2011 23:57:21 -0000	1.5
@@ -249,8 +249,8 @@
                             char* pAsxGenURL, const char* pExtensions) = 0;
     virtual void AddMountPointEntry(const char* pMountPoint, UINT32 uSearchOrder,
                         const char* pBasePath, const char* pDescription) = 0;
-    virtual void AddDirEntry(const char* pDirName, UINT32 ulFileModTime) = 0;
-    virtual void AddFileEntry(const char* pFileName, UINT32 ulFileSize, UINT32 \
ulFileModTime) = 0; +    virtual void AddDirEntry(const char* pDirName, UINT64 \
ulFileModTime) = 0; +    virtual void AddFileEntry(const char* pFileName, UINT64 \
ulFileSize, UINT64 ulFileModTime) = 0;  virtual void EndIndex() = 0;
 
 protected:
@@ -269,8 +269,8 @@
                             char* pAsxGenURL, const char* pExtensions);
     virtual void AddMountPointEntry(const char* pMountPoint, UINT32 uSearchOrder,
                         const char* pBasePath, const char* pDescription);
-    void AddDirEntry(const char* pDirName, UINT32 ulFileModTime);
-    void AddFileEntry(const char* pFileName, UINT32 ulFileSize, UINT32 \
ulFileModTime); +    void AddDirEntry(const char* pDirName, UINT64 ulFileModTime);
+    void AddFileEntry(const char* pFileName, UINT64 ulFileSize, UINT64 \
ulFileModTime);  void EndIndex();
 
 private:
@@ -292,8 +292,8 @@
                             char* pAsxGenURL, const char* pExtensions);
     virtual void AddMountPointEntry(const char* pMountPoint, UINT32 uSearchOrder,
                         const char* pBasePath, const char* pDescription);
-    void AddDirEntry(const char* pDirName, UINT32 ulFileModTime);
-    void AddFileEntry(const char* pFileName, UINT32 ulFileSize, UINT32 \
ulFileModTime); +    void AddDirEntry(const char* pDirName, UINT64 ulFileModTime);
+    void AddFileEntry(const char* pFileName, UINT64 ulFileSize, UINT64 \
ulFileModTime);  void EndIndex();
 
 private:


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs


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