History

kernel/sysctl-test: Remove some casts which are no-longer required

With some of the stricter type checking in KUnit's EXPECT macros removed, several casts in sysctl-test are no longer required. Remove the unnecessary casts, making the conditions clearer.

David Gow committed 5 years ago

Commit 388ca2e1 parent 8f0877c1 file · +12 −12Browse files

Unified · Split

kernel/sysctl-test.c+12−12
@@ -49,7 +49,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test) · 48 unmodified lines
49 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,49 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,
50 KUNIT_PROC_READ, buffer, &len,50 KUNIT_PROC_READ, buffer, &len,
51 &pos));51 &pos));
52 KUNIT_EXPECT_EQ(test, (size_t)0, len);52 KUNIT_EXPECT_EQ(test, 0, len);
53 53
54 /*54 /*
55 * See above.55 * See above.
@@ -58,7 +58,7 @@ static void sysctl_test_api_dointvec_null_tbl_data(struct kunit *test) · 2 unmodified lines
58 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,58 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&null_data_table,
59 KUNIT_PROC_WRITE, buffer, &len,59 KUNIT_PROC_WRITE, buffer, &len,
60 &pos));60 &pos));
61 KUNIT_EXPECT_EQ(test, (size_t)0, len);61 KUNIT_EXPECT_EQ(test, 0, len);
62}62}
63 63
64/*64/*
@@ -95,7 +95,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test) · 30 unmodified lines
95 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,95 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,
96 KUNIT_PROC_READ, buffer, &len,96 KUNIT_PROC_READ, buffer, &len,
97 &pos));97 &pos));
98 KUNIT_EXPECT_EQ(test, (size_t)0, len);98 KUNIT_EXPECT_EQ(test, 0, len);
99 99
100 /*100 /*
101 * See previous comment.101 * See previous comment.
@@ -104,7 +104,7 @@ static void sysctl_test_api_dointvec_table_maxlen_unset(struct kunit *test) · 2 unmodified lines
104 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,104 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&data_maxlen_unset_table,
105 KUNIT_PROC_WRITE, buffer, &len,105 KUNIT_PROC_WRITE, buffer, &len,
106 &pos));106 &pos));
107 KUNIT_EXPECT_EQ(test, (size_t)0, len);107 KUNIT_EXPECT_EQ(test, 0, len);
108}108}
109 109
110/*110/*
@@ -135,11 +135,11 @@ static void sysctl_test_api_dointvec_table_len_is_zero(struct kunit *test) · 24 unmodified lines
135 135
136 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,136 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,
137 &len, &pos));137 &len, &pos));
138 KUNIT_EXPECT_EQ(test, (size_t)0, len);138 KUNIT_EXPECT_EQ(test, 0, len);
139 139
140 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, buffer,140 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE, buffer,
141 &len, &pos));141 &len, &pos));
142 KUNIT_EXPECT_EQ(test, (size_t)0, len);142 KUNIT_EXPECT_EQ(test, 0, len);
143}143}
144 144
145/*145/*
@@ -174,7 +174,7 @@ static void sysctl_test_api_dointvec_table_read_but_position_set( · 28 unmodified lines
174 174
175 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,175 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ, buffer,
176 &len, &pos));176 &len, &pos));
177 KUNIT_EXPECT_EQ(test, (size_t)0, len);177 KUNIT_EXPECT_EQ(test, 0, len);
178}178}
179 179
180/*180/*
@@ -203,7 +203,7 @@ static void sysctl_test_dointvec_read_happy_single_positive(struct kunit *test) · 22 unmodified lines
203 203
204 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,204 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,
205 user_buffer, &len, &pos));205 user_buffer, &len, &pos));
206 KUNIT_ASSERT_EQ(test, (size_t)3, len);206 KUNIT_ASSERT_EQ(test, 3, len);
207 buffer[len] = '\0';207 buffer[len] = '\0';
208 /* And we read 13 back out. */208 /* And we read 13 back out. */
209 KUNIT_EXPECT_STREQ(test, "13\n", buffer);209 KUNIT_EXPECT_STREQ(test, "13\n", buffer);
@@ -233,9 +233,9 @@ static void sysctl_test_dointvec_read_happy_single_negative(struct kunit *test) · 23 unmodified lines
233 233
234 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,234 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_READ,
235 user_buffer, &len, &pos));235 user_buffer, &len, &pos));
236 KUNIT_ASSERT_EQ(test, (size_t)4, len);236 KUNIT_ASSERT_EQ(test, 4, len);
237 buffer[len] = '\0';237 buffer[len] = '\0';
238 KUNIT_EXPECT_STREQ(test, "-16\n", (char *)buffer);238 KUNIT_EXPECT_STREQ(test, "-16\n", buffer);
239}239}
240 240
241/*241/*
@@ -265,7 +265,7 @@ static void sysctl_test_dointvec_write_happy_single_positive(struct kunit *test) · 23 unmodified lines
265 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,265 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,
266 user_buffer, &len, &pos));266 user_buffer, &len, &pos));
267 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);267 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);
268 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, (size_t)pos);268 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, pos);
269 KUNIT_EXPECT_EQ(test, 9, *((int *)table.data));269 KUNIT_EXPECT_EQ(test, 9, *((int *)table.data));
270}270}
271 271
@@ -295,7 +295,7 @@ static void sysctl_test_dointvec_write_happy_single_negative(struct kunit *test) · 23 unmodified lines
295 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,295 KUNIT_EXPECT_EQ(test, 0, proc_dointvec(&table, KUNIT_PROC_WRITE,
296 user_buffer, &len, &pos));296 user_buffer, &len, &pos));
297 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);297 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, len);
298 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, (size_t)pos);298 KUNIT_EXPECT_EQ(test, sizeof(input) - 1, pos);
299 KUNIT_EXPECT_EQ(test, -9, *((int *)table.data));299 KUNIT_EXPECT_EQ(test, -9, *((int *)table.data));
300}300}
301 301