Lines 1-6
Link Here
|
1 |
--- bonnie++.cpp.orig 2016-06-30 09:41:41.000000000 +0000 |
1 |
--- bonnie++.cpp.orig 2019-09-02 18:10:39.852145000 +0200 |
2 |
+++ bonnie++.cpp 2016-10-18 19:52:40.381679719 +0000 |
2 |
+++ bonnie++.cpp 2019-09-02 18:12:18.027222000 +0200 |
3 |
@@ -294,11 +294,7 @@ |
3 |
@@ -298,11 +298,7 @@ |
4 |
{ |
4 |
{ |
5 |
char *sbuf = _strdup(optarg); |
5 |
char *sbuf = _strdup(optarg); |
6 |
char *size = strtok(sbuf, ":"); |
6 |
char *size = strtok(sbuf, ":"); |
Lines 9-18
Link Here
|
9 |
-#else |
9 |
-#else |
10 |
- file_size = size_from_str(size, "g"); |
10 |
- file_size = size_from_str(size, "g"); |
11 |
-#endif |
11 |
-#endif |
12 |
size = strtok(NULL, ""); |
12 |
char * chunk_size = strtok(NULL, ":"); |
13 |
if(size) |
13 |
if(chunk_size) |
14 |
{ |
14 |
{ |
15 |
@@ -384,15 +380,6 @@ |
15 |
@@ -398,15 +394,6 @@ |
16 |
if(file_size % 1024 > 512) |
16 |
if(file_size % 1024 > 512) |
17 |
file_size = file_size + 1024 - (file_size % 1024); |
17 |
file_size = file_size + 1024 - (file_size % 1024); |
18 |
} |
18 |
} |
Lines 28-34
Link Here
|
28 |
globals.byte_io_size = min(file_size, globals.byte_io_size); |
28 |
globals.byte_io_size = min(file_size, globals.byte_io_size); |
29 |
globals.byte_io_size = max(0, globals.byte_io_size); |
29 |
globals.byte_io_size = max(0, globals.byte_io_size); |
30 |
|
30 |
|
31 |
@@ -465,14 +452,6 @@ |
31 |
@@ -479,14 +466,6 @@ |
32 |
&& (directory_max_size < directory_min_size || directory_max_size < 0 |
32 |
&& (directory_max_size < directory_min_size || directory_max_size < 0 |
33 |
|| directory_min_size < 0) ) |
33 |
|| directory_min_size < 0) ) |
34 |
usage(); |
34 |
usage(); |