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

Side by Side Diff: third_party/zlib/google/zip.cc

Issue 1552513002: Switch to standard integer types in third_party/zlib/google/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « third_party/zlib/google/zip.h ('k') | third_party/zlib/google/zip_internal.h » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "third_party/zlib/google/zip.h" 5 #include "third_party/zlib/google/zip.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file.h" 11 #include "base/files/file.h"
12 #include "base/files/file_enumerator.h" 12 #include "base/files/file_enumerator.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "build/build_config.h"
16 #include "third_party/zlib/google/zip_internal.h" 17 #include "third_party/zlib/google/zip_internal.h"
17 #include "third_party/zlib/google/zip_reader.h" 18 #include "third_party/zlib/google/zip_reader.h"
18 19
19 #if defined(USE_SYSTEM_MINIZIP) 20 #if defined(USE_SYSTEM_MINIZIP)
20 #include <minizip/unzip.h> 21 #include <minizip/unzip.h>
21 #include <minizip/zip.h> 22 #include <minizip/zip.h>
22 #else 23 #else
23 #include "third_party/zlib/contrib/minizip/unzip.h" 24 #include "third_party/zlib/contrib/minizip/unzip.h"
24 #include "third_party/zlib/contrib/minizip/zip.h" 25 #include "third_party/zlib/contrib/minizip/zip.h"
25 #endif 26 #endif
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 if (ZIP_OK != zipClose(zip_file, NULL)) { 196 if (ZIP_OK != zipClose(zip_file, NULL)) {
196 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd; 197 DLOG(ERROR) << "Error closing zip file for fd " << dest_fd;
197 success = false; 198 success = false;
198 } 199 }
199 200
200 return success; 201 return success;
201 } 202 }
202 #endif // defined(OS_POSIX) 203 #endif // defined(OS_POSIX)
203 204
204 } // namespace zip 205 } // namespace zip
OLDNEW
« no previous file with comments | « third_party/zlib/google/zip.h ('k') | third_party/zlib/google/zip_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698