1
1
#![ no_std]
2
2
#![ feature( const_str_as_bytes) ]
3
3
4
- use core:: sync:: atomic:: { AtomicBool , Ordering } ;
5
4
use core:: convert:: TryInto ;
5
+ use core:: sync:: atomic:: { AtomicBool , Ordering } ;
6
6
7
7
use serde:: Serialize ;
8
8
use serde_json_core;
9
9
10
+ use linux_kernel_module:: error;
10
11
use linux_kernel_module:: sysctl:: Sysctl ;
11
12
use linux_kernel_module:: Mode ;
12
- use linux_kernel_module:: error;
13
13
14
14
static A : AtomicBool = AtomicBool :: new ( false ) ;
15
15
static B : AtomicBool = AtomicBool :: new ( false ) ;
@@ -35,7 +35,8 @@ impl linux_kernel_module::chrdev::FileOperations for JsonChrdev {
35
35
b : B . load ( Ordering :: Relaxed ) ,
36
36
c : C . load ( Ordering :: Relaxed ) ,
37
37
} ;
38
- let mut s = serde_json_core:: to_string :: < typenum:: U32 , _ > ( & o) . map_err ( |_| error:: Error :: ENOMEM ) ?;
38
+ let mut s =
39
+ serde_json_core:: to_string :: < typenum:: U32 , _ > ( & o) . map_err ( |_| error:: Error :: ENOMEM ) ?;
39
40
s. push_str ( "\n " ) . map_err ( |_| error:: Error :: ENOMEM ) ?;
40
41
buf. write ( & s. into_bytes ( ) [ offset. try_into ( ) ?..] [ ..buf. len ( ) ] ) ?;
41
42
Ok ( ( ) )
@@ -62,24 +63,9 @@ impl linux_kernel_module::KernelModule for JsonSysctlModule {
62
63
. register_device :: < JsonChrdev > ( )
63
64
. build ( ) ?;
64
65
Ok ( JsonSysctlModule {
65
- _a : Sysctl :: register (
66
- "json-sysctl\x00 " ,
67
- "a\x00 " ,
68
- & A ,
69
- Mode :: from_int ( 0o666 ) ,
70
- ) ?,
71
- _b : Sysctl :: register (
72
- "json-sysctl\x00 " ,
73
- "b\x00 " ,
74
- & B ,
75
- Mode :: from_int ( 0o666 ) ,
76
- ) ?,
77
- _c : Sysctl :: register (
78
- "json-sysctl\x00 " ,
79
- "c\x00 " ,
80
- & C ,
81
- Mode :: from_int ( 0o666 ) ,
82
- ) ?,
66
+ _a : Sysctl :: register ( "json-sysctl\x00 " , "a\x00 " , & A , Mode :: from_int ( 0o666 ) ) ?,
67
+ _b : Sysctl :: register ( "json-sysctl\x00 " , "b\x00 " , & B , Mode :: from_int ( 0o666 ) ) ?,
68
+ _c : Sysctl :: register ( "json-sysctl\x00 " , "c\x00 " , & C , Mode :: from_int ( 0o666 ) ) ?,
83
69
_chrdev_registration : chrdev_registration,
84
70
} )
85
71
}
0 commit comments