[src/trunk]: src/sys/external/bsd/acpica/dist Sigh. Why some people are unabl...

[jruoho <jruoho%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d02b467ac4b
branches:  trunk
changeset: 762193:2d02b467ac4b
user:      jruoho <jruoho%NetBSD.org@localhost>
date:      Thu Feb 17 11:21:40 2011 +0000

description:
Sigh. Why some people are unable to write proper C?

diffstat:

 sys/external/bsd/acpica/dist/include/acutils.h    |  10 ++++----
 sys/external/bsd/acpica/dist/utilities/utdecode.c |  14 +++++-----
 sys/external/bsd/acpica/dist/utilities/utosi.c    |  28 +++++++++++-----------
 3 files changed, 26 insertions(+), 26 deletions(-)

diffs (143 lines):

diff -r 76a8cc544798 -r 2d02b467ac4b sys/external/bsd/acpica/dist/include/acutils.h
--- a/sys/external/bsd/acpica/dist/include/acutils.h    Thu Feb 17 10:59:31 2011 +0000
+++ b/sys/external/bsd/acpica/dist/include/acutils.h    Thu Feb 17 11:21:40 2011 +0000
@@ -133,11 +133,11 @@
 
 #endif
 
-char *
+const char *
 AcpiUtGetTypeName (
     ACPI_OBJECT_TYPE        Type);
 
-char *
+const char *
 AcpiUtGetNodeName (
     void                    *Object);
 
@@ -149,15 +149,15 @@
 AcpiUtGetReferenceName (
     ACPI_OPERAND_OBJECT     *Object);
 
-char *
+const char *
 AcpiUtGetObjectTypeName (
     ACPI_OPERAND_OBJECT     *ObjDesc);
 
-char *
+const char *
 AcpiUtGetRegionName (
     UINT8                   SpaceId);
 
-char *
+const char *
 AcpiUtGetEventName (
     UINT32                  EventId);
 
diff -r 76a8cc544798 -r 2d02b467ac4b sys/external/bsd/acpica/dist/utilities/utdecode.c
--- a/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 10:59:31 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utdecode.c Thu Feb 17 11:21:40 2011 +0000
@@ -192,7 +192,7 @@
 };
 
 
-char *
+const char *
 AcpiUtGetRegionName (
     UINT8                   SpaceId)
 {
@@ -238,7 +238,7 @@
 };
 
 
-char *
+const char *
 AcpiUtGetEventName (
     UINT32                  EventId)
 {
@@ -312,7 +312,7 @@
 };
 
 
-char *
+const char *
 AcpiUtGetTypeName (
     ACPI_OBJECT_TYPE        Type)
 {
@@ -326,7 +326,7 @@
 }
 
 
-char *
+const char *
 AcpiUtGetObjectTypeName (
     ACPI_OPERAND_OBJECT     *ObjDesc)
 {
@@ -352,7 +352,7 @@
  *
  ******************************************************************************/
 
-char *
+const char *
 AcpiUtGetNodeName (
     void                    *Object)
 {
@@ -428,7 +428,7 @@
 };
 
 
-char *
+const char *
 AcpiUtGetDescriptorName (
     void                    *Object)
 {
@@ -534,7 +534,7 @@
     "ACPI_MTX_CommandReady"
 };
 
-char *
+const char *
 AcpiUtGetMutexName (
     UINT32                  MutexId)
 {
diff -r 76a8cc544798 -r 2d02b467ac4b sys/external/bsd/acpica/dist/utilities/utosi.c
--- a/sys/external/bsd/acpica/dist/utilities/utosi.c    Thu Feb 17 10:59:31 2011 +0000
+++ b/sys/external/bsd/acpica/dist/utilities/utosi.c    Thu Feb 17 11:21:40 2011 +0000
@@ -64,23 +64,23 @@
  */
 static ACPI_INTERFACE_INFO    AcpiDefaultSupportedInterfaces[] =
 {
-    /* Operating System Vendor Strings */
+       /* Operating System Vendor Strings */
 
-    {"Windows 2000",        NULL, 0, ACPI_OSI_WIN_2000},         /* Windows 2000 */
-    {"Windows 2001",        NULL, 0, ACPI_OSI_WIN_XP},           /* Windows XP */
-    {"Windows 2001 SP1",    NULL, 0, ACPI_OSI_WIN_XP_SP1},       /* Windows XP SP1 */
-    {"Windows 2001.1",      NULL, 0, ACPI_OSI_WINSRV_2003},      /* Windows Server 2003 */
-    {"Windows 2001 SP2",    NULL, 0, ACPI_OSI_WIN_XP_SP2},       /* Windows XP SP2 */
-    {"Windows 2001.1 SP1",  NULL, 0, ACPI_OSI_WINSRV_2003_SP1},  /* Windows Server 2003 SP1 - Added 03/2006 */
-    {"Windows 2006",        NULL, 0, ACPI_OSI_WIN_VISTA},        /* Windows Vista - Added 03/2006 */
-    {"Windows 2006.1",      NULL, 0, ACPI_OSI_WINSRV_2008},      /* Windows Server 2008 - Added 09/2009 */
-    {"Windows 2006 SP1",    NULL, 0, ACPI_OSI_WIN_VISTA_SP1},    /* Windows Vista SP1 - Added 09/2009 */
-    {"Windows 2006 SP2",    NULL, 0, ACPI_OSI_WIN_VISTA_SP2},    /* Windows Vista SP2 - Added 09/2010 */
-    {"Windows 2009",        NULL, 0, ACPI_OSI_WIN_7},            /* Windows 7 and Server 2008 R2 - Added 09/2009 */
+       {__UNCONST("Windows 2000"),        NULL, 0, ACPI_OSI_WIN_2000},         /* Windows 2000 */
+       {__UNCONST("Windows 2001"),        NULL, 0, ACPI_OSI_WIN_XP},           /* Windows XP */
+       {__UNCONST("Windows 2001 SP1"),    NULL, 0, ACPI_OSI_WIN_XP_SP1},       /* Windows XP SP1 */
+       {__UNCONST("Windows 2001.1"),      NULL, 0, ACPI_OSI_WINSRV_2003},      /* Windows Server 2003 */
+       {__UNCONST("Windows 2001 SP2"),    NULL, 0, ACPI_OSI_WIN_XP_SP2},       /* Windows XP SP2 */
+       {__UNCONST("Windows 2001.1 SP1"),  NULL, 0, ACPI_OSI_WINSRV_2003_SP1},  /* Windows Server 2003 SP1 - Added 03/2006 */
+       {__UNCONST("Windows 2006"),        NULL, 0, ACPI_OSI_WIN_VISTA},        /* Windows Vista - Added 03/2006 */
+       {__UNCONST("Windows 2006.1"),      NULL, 0, ACPI_OSI_WINSRV_2008},      /* Windows Server 2008 - Added 09/2009 */
+       {__UNCONST("Windows 2006 SP1"),    NULL, 0, ACPI_OSI_WIN_VISTA_SP1},    /* Windows Vista SP1 - Added 09/2009 */
+       {__UNCONST("Windows 2006 SP2"),    NULL, 0, ACPI_OSI_WIN_VISTA_SP2},    /* Windows Vista SP2 - Added 09/2010 */
+       {__UNCONST("Windows 2009"),        NULL, 0, ACPI_OSI_WIN_7},            /* Windows 7 and Server 2008 R2 - Added 09/2009 */
 
-    /* Feature Group Strings */
+       /* Feature Group Strings */
 
-    {"Extended Address Space Descriptor", NULL, 0, 0}
+       {__UNCONST("Extended Address Space Descriptor"), NULL, 0, 0}
 
     /*
      * All "optional" feature group strings (features that are implemented