ACPICA: De-macroize calls to standard C library functions
ACPICA commit 3b1026e0bdd3c32eb6d5d313f3ba0b1fee7597b4 ACPICA commit 00f0dc83f5cfca53b27a3213ae0d7719b88c2d6b ACPICA commit 47d22a738d0e19fd241ffe4e3e9d4e198e4afc69 Across all of ACPICA. Replace C library macros such as ACPI_STRLEN with the standard names such as strlen. The original purpose for these macros is long since obsolete. Also cast various invocations as necessary. Bob Moore, Jung-uk Kim, Lv Zheng. Link: https://github.com/acpica/acpica/commit/3b1026e0 Link: https://github.com/acpica/acpica/commit/00f0dc83 Link: https://github.com/acpica/acpica/commit/47d22a73 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Jung-uk Kim <jkim@FreeBSD.org> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:

committad av
Rafael J. Wysocki

förälder
63c43812ee
incheckning
4fa4616e27
@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
|
||||
argv[acpi_gbl_optind][0] != '-' ||
|
||||
argv[acpi_gbl_optind][1] == '\0') {
|
||||
return (ACPI_OPT_END);
|
||||
} else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) {
|
||||
} else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
|
||||
acpi_gbl_optind++;
|
||||
return (ACPI_OPT_END);
|
||||
}
|
||||
@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
|
||||
/* Make sure that the option is legal */
|
||||
|
||||
if (current_char == ':' ||
|
||||
(opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) {
|
||||
(opts_ptr = strchr(opts, current_char)) == NULL) {
|
||||
ACPI_OPTION_ERROR("Illegal option: -", current_char);
|
||||
|
||||
if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
|
||||
|
@@ -222,7 +222,7 @@ acpi_os_get_table_by_address(acpi_physical_address address,
|
||||
goto exit;
|
||||
}
|
||||
|
||||
ACPI_MEMCPY(local_table, mapped_table, table_length);
|
||||
memcpy(local_table, mapped_table, table_length);
|
||||
|
||||
exit:
|
||||
osl_unmap_table(mapped_table);
|
||||
@@ -531,7 +531,7 @@ static acpi_status osl_load_rsdp(void)
|
||||
gbl_rsdp_address =
|
||||
rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address);
|
||||
|
||||
ACPI_MEMCPY(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
|
||||
memcpy(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
|
||||
acpi_os_unmap_memory(rsdp_address, rsdp_size);
|
||||
|
||||
return (AE_OK);
|
||||
@@ -964,7 +964,7 @@ osl_get_bios_table(char *signature,
|
||||
goto exit;
|
||||
}
|
||||
|
||||
ACPI_MEMCPY(local_table, mapped_table, table_length);
|
||||
memcpy(local_table, mapped_table, table_length);
|
||||
*address = table_address;
|
||||
*table = local_table;
|
||||
|
||||
|
@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature)
|
||||
acpi_status status;
|
||||
int table_status;
|
||||
|
||||
if (ACPI_STRLEN(signature) != ACPI_NAME_SIZE) {
|
||||
if (strlen(signature) != ACPI_NAME_SIZE) {
|
||||
acpi_log_error
|
||||
("Invalid table signature [%s]: must be exactly 4 characters\n",
|
||||
signature);
|
||||
@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature)
|
||||
|
||||
/* Table signatures are expected to be uppercase */
|
||||
|
||||
ACPI_STRCPY(local_signature, signature);
|
||||
strcpy(local_signature, signature);
|
||||
acpi_ut_strupr(local_signature);
|
||||
|
||||
/* To be friendly, handle tables whose signatures do not match the name */
|
||||
|
||||
if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
|
||||
ACPI_STRCPY(local_signature, ACPI_SIG_FADT);
|
||||
strcpy(local_signature, ACPI_SIG_FADT);
|
||||
} else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
|
||||
ACPI_STRCPY(local_signature, ACPI_SIG_MADT);
|
||||
strcpy(local_signature, ACPI_SIG_MADT);
|
||||
}
|
||||
|
||||
/* Dump all instances of this signature (to handle multiple SSDTs) */
|
||||
|
@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
|
||||
} else {
|
||||
ACPI_MOVE_NAME(filename, table->signature);
|
||||
}
|
||||
filename[0] = (char)ACPI_TOLOWER(filename[0]);
|
||||
filename[1] = (char)ACPI_TOLOWER(filename[1]);
|
||||
filename[2] = (char)ACPI_TOLOWER(filename[2]);
|
||||
filename[3] = (char)ACPI_TOLOWER(filename[3]);
|
||||
filename[0] = (char)tolower((int)filename[0]);
|
||||
filename[1] = (char)tolower((int)filename[1]);
|
||||
filename[2] = (char)tolower((int)filename[2]);
|
||||
filename[3] = (char)tolower((int)filename[3]);
|
||||
filename[ACPI_NAME_SIZE] = 0;
|
||||
|
||||
/* Handle multiple SSDts - create different filenames for each */
|
||||
@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
|
||||
if (instance > 0) {
|
||||
acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
|
||||
instance);
|
||||
ACPI_STRCAT(filename, instance_str);
|
||||
strcat(filename, instance_str);
|
||||
}
|
||||
|
||||
ACPI_STRCAT(filename, ACPI_TABLE_FILE_SUFFIX);
|
||||
strcat(filename, ACPI_TABLE_FILE_SUFFIX);
|
||||
|
||||
if (gbl_verbose_mode) {
|
||||
acpi_log_error
|
||||
|
Referens i nytt ärende
Block a user