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

Side by Side Diff: base/memory/scoped_native_library.cc

Issue 6864020: linux: don't always print dlopen errors from LoadNativeLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: owners Created 9 years, 8 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 | « app/win/shell.cc ('k') | base/native_library.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/memory/scoped_native_library.h" 5 #include "base/memory/scoped_native_library.h"
6 6
7 namespace base { 7 namespace base {
8 8
9 ScopedNativeLibrary::ScopedNativeLibrary() : library_(NULL) { 9 ScopedNativeLibrary::ScopedNativeLibrary() : library_(NULL) {
10 } 10 }
11 11
12 ScopedNativeLibrary::ScopedNativeLibrary(NativeLibrary library) 12 ScopedNativeLibrary::ScopedNativeLibrary(NativeLibrary library)
13 : library_(library) { 13 : library_(library) {
14 } 14 }
15 15
16 ScopedNativeLibrary::ScopedNativeLibrary(const FilePath& library_path) { 16 ScopedNativeLibrary::ScopedNativeLibrary(const FilePath& library_path) {
17 library_ = base::LoadNativeLibrary(library_path); 17 library_ = base::LoadNativeLibrary(library_path, NULL);
18 } 18 }
19 19
20 ScopedNativeLibrary::~ScopedNativeLibrary() { 20 ScopedNativeLibrary::~ScopedNativeLibrary() {
21 if (library_) 21 if (library_)
22 base::UnloadNativeLibrary(library_); 22 base::UnloadNativeLibrary(library_);
23 } 23 }
24 24
25 void* ScopedNativeLibrary::GetFunctionPointer( 25 void* ScopedNativeLibrary::GetFunctionPointer(
26 const char* function_name) const { 26 const char* function_name) const {
27 if (!library_) 27 if (!library_)
28 return NULL; 28 return NULL;
29 return base::GetFunctionPointerFromNativeLibrary(library_, function_name); 29 return base::GetFunctionPointerFromNativeLibrary(library_, function_name);
30 } 30 }
31 31
32 void ScopedNativeLibrary::Reset(NativeLibrary library) { 32 void ScopedNativeLibrary::Reset(NativeLibrary library) {
33 if (library_) 33 if (library_)
34 base::UnloadNativeLibrary(library_); 34 base::UnloadNativeLibrary(library_);
35 library_ = library; 35 library_ = library;
36 } 36 }
37 37
38 NativeLibrary ScopedNativeLibrary::Release() { 38 NativeLibrary ScopedNativeLibrary::Release() {
39 NativeLibrary result = library_; 39 NativeLibrary result = library_;
40 library_ = NULL; 40 library_ = NULL;
41 return result; 41 return result;
42 } 42 }
43 43
44 } // namespace base 44 } // namespace base
OLDNEW
« no previous file with comments | « app/win/shell.cc ('k') | base/native_library.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698