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

Side by Side Diff: components/storage_monitor/udev_util_linux.cc

Issue 302093009: Linux: Unify udev scopers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | « components/storage_monitor/udev_util_linux.h ('k') | device/hid/device_monitor_linux.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/storage_monitor/udev_util_linux.h" 5 #include "components/storage_monitor/udev_util_linux.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "device/udev_linux/udev.h"
8 9
9 namespace storage_monitor { 10 namespace storage_monitor {
10 11
11 void UdevDeleter::operator()(struct udev* udev) {
12 udev_unref(udev);
13 }
14
15 void UdevDeviceDeleter::operator()(struct udev_device* device) {
16 udev_device_unref(device);
17 }
18
19 std::string GetUdevDevicePropertyValue(struct udev_device* udev_device, 12 std::string GetUdevDevicePropertyValue(struct udev_device* udev_device,
20 const char* key) { 13 const char* key) {
21 const char* value = udev_device_get_property_value(udev_device, key); 14 const char* value = udev_device_get_property_value(udev_device, key);
22 return value ? value : std::string(); 15 return value ? value : std::string();
23 } 16 }
24 17
25 bool GetUdevDevicePropertyValueByPath(const base::FilePath& device_path, 18 bool GetUdevDevicePropertyValueByPath(const base::FilePath& device_path,
26 const char* key, 19 const char* key,
27 std::string* result) { 20 std::string* result) {
28 ScopedUdevObject udev(udev_new()); 21 device::ScopedUdevPtr udev(udev_new());
29 if (!udev.get()) 22 if (!udev.get())
30 return false; 23 return false;
31 ScopedUdevDeviceObject device(udev_device_new_from_syspath( 24 device::ScopedUdevDevicePtr device(udev_device_new_from_syspath(
32 udev.get(), device_path.value().c_str())); 25 udev.get(), device_path.value().c_str()));
33 if (!device.get()) 26 if (!device.get())
34 return false; 27 return false;
35 *result = GetUdevDevicePropertyValue(device.get(), key); 28 *result = GetUdevDevicePropertyValue(device.get(), key);
36 return true; 29 return true;
37 } 30 }
38 31
39 } // namespace storage_monitor 32 } // namespace storage_monitor
OLDNEW
« no previous file with comments | « components/storage_monitor/udev_util_linux.h ('k') | device/hid/device_monitor_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698