svn commit: r249821 - head/usr.sbin/acpi/acpidb

[Jung-uk Kim]

Author: jkim
Date: Tue Apr 23 19:42:45 2013
New Revision: 249821
URL: http://svnweb.freebsd.org/changeset/base/249821

Log:
  Fix declarations to slightly increase WARNS level.

Modified:
  head/usr.sbin/acpi/acpidb/Makefile
  head/usr.sbin/acpi/acpidb/acpidb.c

Modified: head/usr.sbin/acpi/acpidb/Makefile
==============================================================================
--- head/usr.sbin/acpi/acpidb/Makefile	Tue Apr 23 19:40:20 2013	(r249820)
+++ head/usr.sbin/acpi/acpidb/Makefile	Tue Apr 23 19:42:45 2013	(r249821)
@@ -67,7 +67,7 @@ SRCS+=	utaddress.c utalloc.c utcache.c u
 	utxfinit.c
 
 MAN=	acpidb.8
-WARNS?=	2
+WARNS?=	3
 
 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing
 DPADD=	${LIBPTHREAD}

Modified: head/usr.sbin/acpi/acpidb/acpidb.c
==============================================================================
--- head/usr.sbin/acpi/acpidb/acpidb.c	Tue Apr 23 19:40:20 2013	(r249820)
+++ head/usr.sbin/acpi/acpidb/acpidb.c	Tue Apr 23 19:42:45 2013	(r249821)
@@ -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(con
 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