Cleanup

skyjake · Sep 13, 2011 · 4ce49e3 · 4ce49e3
1 parent 9f2a8df
commit 4ce49e3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/doomsday/engine/portable/include/wadfile.h b/doomsday/engine/portable/include/wadfile.h
@@ -46,7 +46,7 @@ typedef struct wadfile_s {
     void** _lumpCache;
 } wadfile_t;
 
-wadfile_t* WadFile_New(const lumpinfo_t* info, streamfile_t* handle);
+wadfile_t* WadFile_New(const lumpinfo_t* info, streamfile_t* sf);
 void WadFile_Delete(wadfile_t* wad);
 
 /// Close this file if open and release any acquired file identifiers.
@@ -122,6 +122,6 @@ int WadFile_LumpCount(wadfile_t* wad);
  * Does the specified file appear to be in WAD format.
  * @return  @c true iff this is a file that can be represented using WadFile.
  */
-boolean WadFile_Recognise(streamfile_t* handle);
+boolean WadFile_Recognise(streamfile_t* sf);
 
 #endif /* LIBDENG_FILESYS_WADFILE_H */
diff --git a/doomsday/engine/portable/src/wadfile.c b/doomsday/engine/portable/src/wadfile.c
@@ -442,11 +442,11 @@ int WadFile_LumpCount(wadfile_t* file)
     return file->_lumpCount;
 }
 
-boolean WadFile_Recognise(streamfile_t* handle)
+boolean WadFile_Recognise(streamfile_t* sf)
 {
     boolean knownFormat = false;
     wadheader_t hdr;
-    if(WadFile_ReadArchiveHeader(handle, &hdr) &&
+    if(WadFile_ReadArchiveHeader(sf, &hdr) &&
        !(memcmp(hdr.identification, "IWAD", 4) && memcmp(hdr.identification, "PWAD", 4)))
     {
         knownFormat = true;

diff --git a/doomsday/engine/portable/src/zipfile.c b/doomsday/engine/portable/src/zipfile.c
@@ -709,13 +709,13 @@ int ZipFile_LumpCount(zipfile_t* file)
     return file->_lumpCount;
 }
 
-boolean ZipFile_Recognise(streamfile_t* handle)
+boolean ZipFile_Recognise(streamfile_t* sf)
 {
     boolean knownFormat = false;
     localfileheader_t hdr;
-    size_t readBytes, initPos = F_Tell(handle);
-    F_Seek(handle, 0, SEEK_SET);
-    readBytes = F_Read(handle, (uint8_t*)&hdr, sizeof(hdr));
+    size_t readBytes, initPos = F_Tell(sf);
+    F_Seek(sf, 0, SEEK_SET);
+    readBytes = F_Read(sf, (uint8_t*)&hdr, sizeof(hdr));
     if(!(readBytes < sizeof(hdr)))
     {
         // Seek to the start of the signature.
@@ -724,7 +724,7 @@ boolean ZipFile_Recognise(streamfile_t* handle)
             knownFormat = true;
         }
     }
-    // Reposition the file stream in case another handler needs to process this file.
-    F_Seek(handle, initPos, SEEK_SET);
+    // Reposition the stream in case another handler needs to process this file.
+    F_Seek(sf, initPos, SEEK_SET);
     return knownFormat;
 }