From 36231ac4af46b6617324dc06cb85543a714fafe3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Tue, 25 Aug 2009 00:43:01 +0000 Subject: [PATCH] minor fixes --- panda/src/downloader/httpChannel.I | 10 ++++++++++ panda/src/downloader/httpChannel.h | 2 ++ panda/src/express/compress_string.cxx | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/panda/src/downloader/httpChannel.I b/panda/src/downloader/httpChannel.I index 1231b38f20..70688efb66 100644 --- a/panda/src/downloader/httpChannel.I +++ b/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 diff --git a/panda/src/downloader/httpChannel.h b/panda/src/downloader/httpChannel.h index cf0f84dd1e..de44e3d47a 100644 --- a/panda/src/downloader/httpChannel.h +++ b/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; diff --git a/panda/src/express/compress_string.cxx b/panda/src/express/compress_string.cxx index 1363b7a24c..4fe5a2f34c 100644 --- a/panda/src/express/compress_string.cxx +++ b/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;