浏览代码

minor fixes

David Rose 16 年之前
父节点
当前提交
36231ac4af
共有 3 个文件被更改,包括 13 次插入1 次删除
  1. 10 0
      panda/src/downloader/httpChannel.I
  2. 2 0
      panda/src/downloader/httpChannel.h
  3. 1 1
      panda/src/express/compress_string.cxx

+ 10 - 0
panda/src/downloader/httpChannel.I

@@ -13,6 +13,16 @@
 ////////////////////////////////////////////////////////////////////
 
 
+////////////////////////////////////////////////////////////////////
+//     Function: HTTPChannel::get_client
+//       Access: Published
+//  Description: Returns the HTTPClient object that owns this channel.
+////////////////////////////////////////////////////////////////////
+INLINE HTTPClient *HTTPChannel::
+get_client() const {
+  return _client;
+}
+
 ////////////////////////////////////////////////////////////////////
 //     Function: HTTPChannel::is_valid
 //       Access: Published

+ 2 - 0
panda/src/downloader/httpChannel.h

@@ -97,6 +97,8 @@ PUBLISHED:
     SC_download_invalid_range,
   };
 
+  INLINE HTTPClient *get_client() const;
+
   INLINE bool is_valid() const;
   INLINE bool is_connection_ready() const;
 

+ 1 - 1
panda/src/express/compress_string.cxx

@@ -115,7 +115,7 @@ EXPCL_PANDAEXPRESS bool
 decompress_file(const Filename &source, const Filename &dest) {
   Filename source_filename = Filename::binary_filename(source);
   VirtualFileSystem *vfs = VirtualFileSystem::get_global_ptr();
-  istream *source_stream = vfs->open_read_file(source_filename, true);
+  istream *source_stream = vfs->open_read_file(source_filename, false);
   if (source_stream == NULL) {
     express_cat.info() << "Couldn't open file " << source_filename << "\n";
     return false;