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

Side by Side Diff: device/udev_linux/scoped_udev.h

Issue 666653002: Cleanup: Merge device/udev_linux/udev.{cc,h} into device/udev_linux/scoped_udev.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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 | « device/udev_linux/BUILD.gn ('k') | device/udev_linux/udev.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 #ifndef DEVICE_UDEV_LINUX_UDEV_H_ 5 #ifndef DEVICE_UDEV_LINUX_SCOPED_UDEV_H_
6 #define DEVICE_UDEV_LINUX_UDEV_H_ 6 #define DEVICE_UDEV_LINUX_SCOPED_UDEV_H_
7 7
8 #include <libudev.h> 8 #include <libudev.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 11
12 #if !defined(USE_UDEV) 12 #if !defined(USE_UDEV)
13 #error "USE_UDEV not defined" 13 #error "USE_UDEV not defined"
14 #endif 14 #endif
15 15
16 namespace device { 16 namespace device {
17 17
18 struct UdevDeleter { 18 struct UdevDeleter {
19 void operator()(udev* dev) const; 19 void operator()(udev* dev) const {
20 udev_unref(dev);
21 }
20 }; 22 };
21 struct UdevEnumerateDeleter { 23 struct UdevEnumerateDeleter {
22 void operator()(udev_enumerate* enumerate) const; 24 void operator()(udev_enumerate* enumerate) const {
25 udev_enumerate_unref(enumerate);
26 }
23 }; 27 };
24 struct UdevDeviceDeleter { 28 struct UdevDeviceDeleter {
25 void operator()(udev_device* device) const; 29 void operator()(udev_device* device) const {
30 udev_device_unref(device);
31 }
26 }; 32 };
27 struct UdevMonitorDeleter { 33 struct UdevMonitorDeleter {
28 void operator()(udev_monitor* monitor) const; 34 void operator()(udev_monitor* monitor) const {
35 udev_monitor_unref(monitor);
36 }
29 }; 37 };
30 38
31 typedef scoped_ptr<udev, UdevDeleter> ScopedUdevPtr; 39 typedef scoped_ptr<udev, UdevDeleter> ScopedUdevPtr;
32 typedef scoped_ptr<udev_enumerate, UdevEnumerateDeleter> ScopedUdevEnumeratePtr; 40 typedef scoped_ptr<udev_enumerate, UdevEnumerateDeleter> ScopedUdevEnumeratePtr;
33 typedef scoped_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr; 41 typedef scoped_ptr<udev_device, UdevDeviceDeleter> ScopedUdevDevicePtr;
34 typedef scoped_ptr<udev_monitor, UdevMonitorDeleter> ScopedUdevMonitorPtr; 42 typedef scoped_ptr<udev_monitor, UdevMonitorDeleter> ScopedUdevMonitorPtr;
35 43
36 } // namespace device 44 } // namespace device
37 45
38 #endif // DEVICE_UDEV_LINUX_UDEV_H_ 46 #endif // DEVICE_UDEV_LINUX_SCOPED_UDEV_H_
OLDNEW
« no previous file with comments | « device/udev_linux/BUILD.gn ('k') | device/udev_linux/udev.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698