Skip to content

Commit 0959480

Browse files
committed
simplify
1 parent 7ec2ff6 commit 0959480

File tree

5 files changed

+4
-18
lines changed

5 files changed

+4
-18
lines changed

+stdlib/disk_available.m

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,10 @@
1818
f = stdlib.java.disk_available(d);
1919
elseif stdlib.has_python()
2020
f = stdlib.python.disk_available(d);
21-
end
22-
23-
if f == 0
21+
else
2422
f = stdlib.sys.disk_available(d);
2523
end
2624

27-
f = uint64(f);
28-
2925
end
3026

3127
%!assert (disk_available('.') > 0)

+stdlib/disk_capacity.m

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,17 @@
77
d {mustBeTextScalar}
88
end
99

10-
f = uint64(0);
1110

1211
if stdlib.has_dotnet()
1312
f = stdlib.dotnet.disk_capacity(d);
1413
elseif stdlib.has_java()
1514
f = stdlib.java.disk_capacity(d);
1615
elseif stdlib.has_python()
1716
f = stdlib.python.disk_capacity(d);
18-
end
19-
20-
if f == 0
17+
else
2118
f = stdlib.sys.disk_capacity(d);
2219
end
2320

24-
f = uint64(f);
25-
2621
end
2722

2823
%!assert (disk_capacity('.') > 0)

+stdlib/get_username.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
%
33
function n = get_username()
44

5-
n = string.empty;
65

76
if stdlib.has_dotnet()
87
n = stdlib.dotnet.get_username();
98
elseif stdlib.has_java()
109
n = stdlib.java.get_username();
1110
elseif stdlib.has_python()
1211
n = stdlib.python.get_username();
13-
end
14-
15-
if stdlib.strempty(n)
12+
else
1613
n = stdlib.sys.get_username();
1714
end
1815

+stdlib/ram_free.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,4 @@
2828
bytes = stdlib.sys.ram_free();
2929
end
3030

31-
bytes = uint64(bytes);
32-
3331
end

test/TestSys.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
user_fun = {@stdlib.get_username, @stdlib.sys.get_username, @stdlib.dotnet.get_username, @stdlib.java.get_username, @stdlib.python.get_username}
1313
is_admin_fun = {@stdlib.is_admin, @stdlib.sys.is_admin, @stdlib.dotnet.is_admin, @stdlib.java.is_admin, @stdlib.python.is_admin}
1414
ram_free_fun = {@stdlib.ram_free, @stdlib.sys.ram_free, @stdlib.java.ram_free, @stdlib.python.ram_free}
15-
ram_total_fun = {@stdlib.ram_total, @stdlib.sys.ram_total, @stdlib.dotnet.ram_total @stdlib.java.ram_total}
15+
ram_total_fun = {@stdlib.ram_total, @stdlib.sys.ram_total, @stdlib.dotnet.ram_total, @stdlib.java.ram_total, @stdlib.python.ram_total}
1616
end
1717

1818
methods(TestClassSetup)

0 commit comments

Comments
 (0)