Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: remoting/base/decompressor_zlib.cc

Issue 7253017: Revert 90625 (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Change NOTREACHED to DCHECK_EQ Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/http/http_cache_transaction.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/base/decompressor_zlib.h" 5 #include "remoting/base/decompressor_zlib.h"
6 6
7 #if defined(USE_SYSTEM_ZLIB) 7 #if defined(USE_SYSTEM_ZLIB)
8 #include <zlib.h> 8 #include <zlib.h>
9 #else 9 #else
10 #include "third_party/zlib/zlib.h" 10 #include "third_party/zlib/zlib.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 } 52 }
53 53
54 void DecompressorZlib::InitStream() { 54 void DecompressorZlib::InitStream() {
55 stream_.reset(new z_stream()); 55 stream_.reset(new z_stream());
56 56
57 stream_->next_in = Z_NULL; 57 stream_->next_in = Z_NULL;
58 stream_->zalloc = Z_NULL; 58 stream_->zalloc = Z_NULL;
59 stream_->zfree = Z_NULL; 59 stream_->zfree = Z_NULL;
60 stream_->opaque = Z_NULL; 60 stream_->opaque = Z_NULL;
61 61
62 inflateInit(stream_.get()); 62 int ret = inflateInit(stream_.get());
63 DCHECK_EQ(ret, Z_OK);
63 } 64 }
64 65
65 } // namespace remoting 66 } // namespace remoting
OLDNEW
« no previous file with comments | « net/http/http_cache_transaction.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698