diff options
| author | jkim <jkim@FreeBSD.org> | 2013-04-23 19:42:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2013-04-23 19:42:45 +0000 |
| commit | 821a71eede1b0c3a1ae516d59e5ba3c14c6b69de (patch) | |
| tree | e3d7642c46347d86839449d56a046dd329d1f96f /usr.sbin/acpi | |
| parent | 0cf697a724b72d38005ba8166618ac363e99b384 (diff) | |
| download | FreeBSD-src-821a71eede1b0c3a1ae516d59e5ba3c14c6b69de.zip FreeBSD-src-821a71eede1b0c3a1ae516d59e5ba3c14c6b69de.tar.gz | |
Fix declarations to slightly increase WARNS level.
Diffstat (limited to 'usr.sbin/acpi')
| -rw-r--r-- | usr.sbin/acpi/acpidb/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/acpi/acpidb/acpidb.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index 5e56bf3..d61e61f 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -67,7 +67,7 @@ SRCS+= utaddress.c utalloc.c utcache.c utcopy.c utdebug.c \ utxfinit.c MAN= acpidb.8 -WARNS?= 2 +WARNS?= 3 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing DPADD= ${LIBPTHREAD} diff --git a/usr.sbin/acpi/acpidb/acpidb.c b/usr.sbin/acpi/acpidb/acpidb.c index 4095252..40522ca 100644 --- a/usr.sbin/acpi/acpidb/acpidb.c +++ b/usr.sbin/acpi/acpidb/acpidb.c @@ -50,7 +50,7 @@ * Dummy DSDT Table Header */ -ACPI_TABLE_HEADER dummy_dsdt_table = { +static ACPI_TABLE_HEADER dummy_dsdt_table = { "DSDT", 123, 1, 123, "OEMID", "OEMTBLID", 1, "CRID", 1 }; @@ -58,7 +58,7 @@ ACPI_TABLE_HEADER dummy_dsdt_table = { * Region space I/O routines on virtual machine */ -int aml_debug_prompt = 1; +static int aml_debug_prompt = 1; struct ACPIRegionContent { TAILQ_ENTRY(ACPIRegionContent) links; @@ -68,10 +68,13 @@ struct ACPIRegionContent { }; TAILQ_HEAD(ACPIRegionContentList, ACPIRegionContent); -struct ACPIRegionContentList RegionContentList; +static struct ACPIRegionContentList RegionContentList; static int aml_simulation_initialized = 0; +ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer(void); +void AeTableOverride(ACPI_TABLE_HEADER *, ACPI_TABLE_HEADER **); + static void aml_simulation_init(void); static int aml_simulate_regcontent_add(int regtype, ACPI_PHYSICAL_ADDRESS addr, @@ -87,11 +90,11 @@ static void aml_simulation_regload(const char *dumpfile); static void aml_simulation_regdump(const char *dumpfile); /* Stubs to simplify linkage to the ACPI CA core subsystem. */ -ACPI_STATUS +ACPI_PHYSICAL_ADDRESS AeLocalGetRootPointer(void) { - return (AE_ERROR); + return (0); } void |
