1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
|
diff --git a/src/ext2.cc b/src/ext2.cc
index dfb9653..c2ad1fe 100644
--- a/src/ext2.cc
+++ b/src/ext2.cc
@@ -179,12 +179,12 @@ void ext2::set_used_sectors( Partition & partition )
{
Glib::ustring::size_type index = output.find( "Block count:" );
if ( index >= output .length() ||
- sscanf( output.substr( index ) .c_str(), "Block count: %Ld", &T ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "Block count: %lld", &T ) != 1 )
T = -1 ;
index = output .find( "Block size:" ) ;
if ( index >= output.length() ||
- sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "Block size: %lld", &S ) != 1 )
S = -1 ;
if ( T > -1 && S > -1 )
@@ -207,7 +207,7 @@ void ext2::set_used_sectors( Partition & partition )
{
index = output .find( "Free blocks:" ) ;
if ( index >= output .length() ||
- sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "Free blocks: %lld", &N ) != 1 )
N = -1 ;
if ( N > -1 && S > -1 )
@@ -382,7 +382,7 @@ void ext2::create_progress( OperationDetail *operationdetail )
Glib::ustring line = Utils::last_line( output );
// Text progress on the LAST LINE looks like "Writing inode tables: 105/1600"
long long progress, target;
- if ( sscanf( line.c_str(), "Writing inode tables: %Ld/%Ld", &progress, &target ) == 2 )
+ if ( sscanf( line.c_str(), "Writing inode tables: %lld/%lld", &progress, &target ) == 2 )
{
operationdetail->run_progressbar( (double)progress, (double)target );
}
@@ -422,7 +422,7 @@ void ext2::copy_progress( OperationDetail *operationdetail )
Glib::ustring line = Utils::last_line( error );
// Text progress on the LAST LINE of STDERR looks like "Copying 146483 / 258033 blocks ..."
long long progress, target;
- if ( sscanf( line.c_str(), "Copying %Ld / %Ld blocks", &progress, &target ) == 2 )
+ if ( sscanf( line.c_str(), "Copying %lld / %lld blocks", &progress, &target ) == 2 )
{
operationdetail->run_progressbar( (double)(progress * fs_block_size),
(double)(target * fs_block_size),
diff --git a/src/fat16.cc b/src/fat16.cc
index fe38898..bfb2b0e 100644
--- a/src/fat16.cc
+++ b/src/fat16.cc
@@ -137,12 +137,12 @@ void fat16::set_used_sectors( Partition & partition )
{
//total file system size in logical sectors
Glib::ustring::size_type index = output.rfind( "\n", output.find( "sectors total" ) ) + 1;
- if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%Ld", &T ) != 1 )
+ if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%lld", &T ) != 1 )
T = -1 ;
//bytes per logical sector
index = output .rfind( "\n", output .find( "bytes per logical sector" ) ) +1 ;
- if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%Ld", &S ) != 1 )
+ if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%lld", &S ) != 1 )
S = -1 ;
if ( T > -1 && S > -1 )
@@ -150,14 +150,14 @@ void fat16::set_used_sectors( Partition & partition )
//free clusters
index = output .find( ",", output .find( partition .get_path() ) + partition .get_path() .length() ) +1 ;
- if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%Ld/%Ld", &S, &N ) == 2 )
+ if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%lld/%lld", &S, &N ) == 2 )
N -= S ;
else
N = -1 ;
//bytes per cluster
index = output .rfind( "\n", output .find( "bytes per cluster" ) ) +1 ;
- if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%Ld", &S ) != 1 )
+ if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%lld", &S ) != 1 )
S = -1 ;
if ( N > -1 && S > -1 )
diff --git a/src/jfs.cc b/src/jfs.cc
index 210406b..0747cc6 100644
--- a/src/jfs.cc
+++ b/src/jfs.cc
@@ -81,7 +81,7 @@ void jfs::set_used_sectors( Partition & partition )
//blocksize
Glib::ustring::size_type index = output.find( "Block Size:" );
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "Block Size: %Ld", &S ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "Block Size: %lld", &S ) != 1 )
S = -1 ;
//total blocks
diff --git a/src/linux_swap.cc b/src/linux_swap.cc
index f711dc8..9c513ff 100644
--- a/src/linux_swap.cc
+++ b/src/linux_swap.cc
@@ -85,7 +85,7 @@ void linux_swap::set_used_sectors( Partition & partition )
{
if ( line .substr( 0, path_len ) == path )
{
- sscanf( line.substr( path_len ).c_str(), " %*s %*d %Ld", &N );
+ sscanf( line.substr( path_len ).c_str(), " %*s %*d %lld", &N );
break ;
}
}
diff --git a/src/nilfs2.cc b/src/nilfs2.cc
index ec84bf9..6a274b2 100644
--- a/src/nilfs2.cc
+++ b/src/nilfs2.cc
@@ -79,20 +79,20 @@ void nilfs2::set_used_sectors( Partition & partition )
//File system size in bytes
Glib::ustring::size_type index = output .find( "Device size:" ) ;
if ( index == Glib::ustring::npos
- || sscanf( output.substr( index ) .c_str(), "Device size: %Ld", &T ) != 1
+ || sscanf( output.substr( index ) .c_str(), "Device size: %lld", &T ) != 1
)
T = -1 ;
//Free space in blocks
index = output .find( "Free blocks count:" ) ;
if ( index == Glib::ustring::npos
- || sscanf( output.substr( index ) .c_str(), "Free blocks count: %Ld", &N ) != 1
+ || sscanf( output.substr( index ) .c_str(), "Free blocks count: %lld", &N ) != 1
)
N = -1 ;
index = output .find( "Block size:" ) ;
if ( index == Glib::ustring::npos
- || sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1
+ || sscanf( output.substr( index ) .c_str(), "Block size: %lld", &S ) != 1
)
S = -1 ;
diff --git a/src/ntfs.cc b/src/ntfs.cc
index 90031cb..2f166bd 100644
--- a/src/ntfs.cc
+++ b/src/ntfs.cc
@@ -129,12 +129,12 @@ void ntfs::set_used_sectors( Partition & partition )
{
Glib::ustring::size_type index = output.find( "Current volume size:" );
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "Current volume size: %Ld", &T ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "Current volume size: %lld", &T ) != 1 )
T = -1 ;
index = output .find( "resize at" ) ;
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "resize at %Ld", &N ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "resize at %lld", &N ) != 1 )
N = -1 ;
//For an absolutely full NTFS, "ntfsresize --info" exits
// with status 1 and reports this message instead
@@ -144,7 +144,7 @@ void ntfs::set_used_sectors( Partition & partition )
index = output.find( "Cluster size" );
if ( index >= output.length() ||
- sscanf( output.substr( index ).c_str(), "Cluster size : %Ld", &S ) != 1 )
+ sscanf( output.substr( index ).c_str(), "Cluster size : %lld", &S ) != 1 )
S = -1;
if ( T > -1 && N > -1 )
diff --git a/src/reiser4.cc b/src/reiser4.cc
index b588cc4..990e152 100644
--- a/src/reiser4.cc
+++ b/src/reiser4.cc
@@ -66,17 +66,17 @@ void reiser4::set_used_sectors( Partition & partition )
{
Glib::ustring::size_type index = output.find( "\nblocks:" );
if ( index >= output .length() ||
- sscanf( output.substr( index ) .c_str(), "\nblocks: %Ld", &T ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "\nblocks: %lld", &T ) != 1 )
T = -1 ;
index = output .find( "\nfree blocks:" ) ;
if ( index >= output .length() ||
- sscanf( output.substr( index ) .c_str(), "\nfree blocks: %Ld", &N ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "\nfree blocks: %lld", &N ) != 1 )
N = -1 ;
index = output .find( "\nblksize:" ) ;
if ( index >= output.length() ||
- sscanf( output.substr( index ) .c_str(), "\nblksize: %Ld", &S ) != 1 )
+ sscanf( output.substr( index ) .c_str(), "\nblksize: %lld", &S ) != 1 )
S = -1 ;
if ( T > -1 && N > -1 && S > -1 )
diff --git a/src/reiserfs.cc b/src/reiserfs.cc
index ca493cf..6a435f1 100644
--- a/src/reiserfs.cc
+++ b/src/reiserfs.cc
@@ -83,17 +83,17 @@ void reiserfs::set_used_sectors( Partition & partition )
{
Glib::ustring::size_type index = output.find( "Count of blocks on the device:" );
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "Count of blocks on the device: %Ld", &T ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "Count of blocks on the device: %lld", &T ) != 1 )
T = -1 ;
index = output .find( "Blocksize:" ) ;
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "Blocksize: %Ld", &S ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "Blocksize: %lld", &S ) != 1 )
S = -1 ;
index = output .find( ":", output .find( "Free blocks" ) ) +1 ;
if ( index >= output .length() ||
- sscanf( output .substr( index ) .c_str(), "%Ld", &N ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "%lld", &N ) != 1 )
N = -1 ;
if ( T > -1 && N > -1 && S > -1 )
diff --git a/src/xfs.cc b/src/xfs.cc
index d43cf89..c96cabf 100644
--- a/src/xfs.cc
+++ b/src/xfs.cc
@@ -95,19 +95,19 @@ void xfs::set_used_sectors( Partition & partition )
true ) )
{
//blocksize
- if ( sscanf( output .c_str(), "blocksize = %Ld", &S ) != 1 )
+ if ( sscanf( output .c_str(), "blocksize = %lld", &S ) != 1 )
S = -1 ;
//filesystem blocks
Glib::ustring::size_type index = output.find( "\ndblocks" );
if ( index > output .length() ||
- sscanf( output .substr( index ) .c_str(), "\ndblocks = %Ld", &T ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "\ndblocks = %lld", &T ) != 1 )
T = -1 ;
//free blocks
index = output .find( "\nfdblocks" ) ;
if ( index > output .length() ||
- sscanf( output .substr( index ) .c_str(), "\nfdblocks = %Ld", &N ) != 1 )
+ sscanf( output .substr( index ) .c_str(), "\nfdblocks = %lld", &N ) != 1 )
N = -1 ;
if ( T > -1 && N > -1 && S > -1 )
|
