kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace UTIL_ARRAY_SIZE with ARRAY_SIZE

Browse Source 
Replace `UTIL_ARRAY_SIZE` with `ARRAY_SIZE` and remove it from
`util_base.h`.

Acked-by: Jan Höppner <hoeppner@linux.ibm.com>
Reviewed-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2020-03-20 10:57:57 +01:00
committed by Jan Höppner
parent 6cf7f31746
commit c673bacd7e
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fdasd/fdasd.c
View File

@@ -75,7 +75,7 @@ static int get_part_name_by_dsname(char *dsname, char **name)
return 0;
}
for (i = 0; i < UTIL_ARRAY_SIZE(partition_types); i++) {
for (i = 0; i < ARRAY_SIZE(partition_types); i++) {
if (strstr(dsname, partition_types[i].dsname) != NULL) {
*name = partition_types[i].name;
return 0;
@@ -97,7 +97,7 @@ static int get_part_type_by_dsname(char *dsname, int *type)
return 0;
}
for (i = 0; i < UTIL_ARRAY_SIZE(partition_types); i++) {
for (i = 0; i < ARRAY_SIZE(partition_types); i++) {
if (strstr(dsname, partition_types[i].dsname) != NULL) {
*type = partition_types[i].type;
return 0;
@@ -112,7 +112,7 @@ static int get_part_type_by_dsname(char *dsname, int *type)
*/
static int get_part_dsname_by_type(unsigned int type, char **dsname)
{
if (type > UTIL_ARRAY_SIZE(partition_types))
if (type > ARRAY_SIZE(partition_types))
return 1;
if (type == 0)
@@ -1205,7 +1205,7 @@ static void fdasd_list_known_partitions(void)
unsigned int i;
for (i = VALID_PARTITION_OFFSET;
i < UTIL_ARRAY_SIZE(partition_types); i++) {
i < ARRAY_SIZE(partition_types); i++) {
printf("%3d %s\n",
partition_types[i].type, partition_types[i].name);
}
@@ -1622,7 +1622,7 @@ static void fdasd_change_part_type(fdasd_anchor_t *anc)
part_type = 0;
while (part_type < 1 ||
part_type > UTIL_ARRAY_SIZE(partition_types) - 1) {
part_type > ARRAY_SIZE(partition_types) - 1) {
do {
part_type = read_char("new partition type: ");
} while (!isdigit(part_type));