patch-2.4.0-prerelease linux/drivers/acpi/common/cmclib.c
Next file: linux/drivers/acpi/common/cmcopy.c
Previous file: linux/drivers/acpi/common/cmalloc.c
Back to the patch index
Back to the overall index
- Lines: 331
- Date:
Fri Dec 29 14:07:21 2000
- Orig file:
v2.4.0-test12/linux/drivers/acpi/common/cmclib.c
- Orig date:
Sun Oct 8 10:50:13 2000
diff -u --recursive --new-file v2.4.0-test12/linux/drivers/acpi/common/cmclib.c linux/drivers/acpi/common/cmclib.c
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: cmclib - Local implementation of C library functions
- * $Revision: 24 $
+ * $Revision: 28 $
*
*****************************************************************************/
@@ -41,10 +41,6 @@
MODULE_NAME ("cmclib")
-#ifdef _MSC_VER /* disable some level-4 warnings for VC++ */
-#pragma warning(disable:4706) /* warning C4706: assignment within conditional expression */
-#endif
-
#ifndef ACPI_USE_SYSTEM_CLIBRARY
/*******************************************************************************
@@ -371,146 +367,146 @@
#define POSITIVE 0
-#define _XA 0x00 /* extra alphabetic - not supported */
-#define _XS 0x40 /* extra space */
-#define _BB 0x00 /* BEL, BS, etc. - not supported */
-#define _CN 0x20 /* CR, FF, HT, NL, VT */
-#define _DI 0x04 /* '0'-'9' */
-#define _LO 0x02 /* 'a'-'z' */
-#define _PU 0x10 /* punctuation */
-#define _SP 0x08 /* space */
-#define _UP 0x01 /* 'A'-'Z' */
-#define _XD 0x80 /* '0'-'9', 'A'-'F', 'a'-'f' */
-
-const u8 _ctype[257] = {
- _CN, /* 0x0 0. */
- _CN, /* 0x1 1. */
- _CN, /* 0x2 2. */
- _CN, /* 0x3 3. */
- _CN, /* 0x4 4. */
- _CN, /* 0x5 5. */
- _CN, /* 0x6 6. */
- _CN, /* 0x7 7. */
- _CN, /* 0x8 8. */
- _CN|_SP, /* 0x9 9. */
- _CN|_SP, /* 0xA 10. */
- _CN|_SP, /* 0xB 11. */
- _CN|_SP, /* 0xC 12. */
- _CN|_SP, /* 0xD 13. */
- _CN, /* 0xE 14. */
- _CN, /* 0xF 15. */
- _CN, /* 0x10 16. */
- _CN, /* 0x11 17. */
- _CN, /* 0x12 18. */
- _CN, /* 0x13 19. */
- _CN, /* 0x14 20. */
- _CN, /* 0x15 21. */
- _CN, /* 0x16 22. */
- _CN, /* 0x17 23. */
- _CN, /* 0x18 24. */
- _CN, /* 0x19 25. */
- _CN, /* 0x1A 26. */
- _CN, /* 0x1B 27. */
- _CN, /* 0x1C 28. */
- _CN, /* 0x1D 29. */
- _CN, /* 0x1E 30. */
- _CN, /* 0x1F 31. */
- _XS|_SP, /* 0x20 32. ' ' */
- _PU, /* 0x21 33. '!' */
- _PU, /* 0x22 34. '"' */
- _PU, /* 0x23 35. '#' */
- _PU, /* 0x24 36. '$' */
- _PU, /* 0x25 37. '%' */
- _PU, /* 0x26 38. '&' */
- _PU, /* 0x27 39. ''' */
- _PU, /* 0x28 40. '(' */
- _PU, /* 0x29 41. ')' */
- _PU, /* 0x2A 42. '*' */
- _PU, /* 0x2B 43. '+' */
- _PU, /* 0x2C 44. ',' */
- _PU, /* 0x2D 45. '-' */
- _PU, /* 0x2E 46. '.' */
- _PU, /* 0x2F 47. '/' */
- _XD|_DI, /* 0x30 48. '0' */
- _XD|_DI, /* 0x31 49. '1' */
- _XD|_DI, /* 0x32 50. '2' */
- _XD|_DI, /* 0x33 51. '3' */
- _XD|_DI, /* 0x34 52. '4' */
- _XD|_DI, /* 0x35 53. '5' */
- _XD|_DI, /* 0x36 54. '6' */
- _XD|_DI, /* 0x37 55. '7' */
- _XD|_DI, /* 0x38 56. '8' */
- _XD|_DI, /* 0x39 57. '9' */
- _PU, /* 0x3A 58. ':' */
- _PU, /* 0x3B 59. ';' */
- _PU, /* 0x3C 60. '<' */
- _PU, /* 0x3D 61. '=' */
- _PU, /* 0x3E 62. '>' */
- _PU, /* 0x3F 63. '?' */
- _PU, /* 0x40 64. '@' */
- _XD|_UP, /* 0x41 65. 'A' */
- _XD|_UP, /* 0x42 66. 'B' */
- _XD|_UP, /* 0x43 67. 'C' */
- _XD|_UP, /* 0x44 68. 'D' */
- _XD|_UP, /* 0x45 69. 'E' */
- _XD|_UP, /* 0x46 70. 'F' */
- _UP, /* 0x47 71. 'G' */
- _UP, /* 0x48 72. 'H' */
- _UP, /* 0x49 73. 'I' */
- _UP, /* 0x4A 74. 'J' */
- _UP, /* 0x4B 75. 'K' */
- _UP, /* 0x4C 76. 'L' */
- _UP, /* 0x4D 77. 'M' */
- _UP, /* 0x4E 78. 'N' */
- _UP, /* 0x4F 79. 'O' */
- _UP, /* 0x50 80. 'P' */
- _UP, /* 0x51 81. 'Q' */
- _UP, /* 0x52 82. 'R' */
- _UP, /* 0x53 83. 'S' */
- _UP, /* 0x54 84. 'T' */
- _UP, /* 0x55 85. 'U' */
- _UP, /* 0x56 86. 'V' */
- _UP, /* 0x57 87. 'W' */
- _UP, /* 0x58 88. 'X' */
- _UP, /* 0x59 89. 'Y' */
- _UP, /* 0x5A 90. 'Z' */
- _PU, /* 0x5B 91. '[' */
- _PU, /* 0x5C 92. '\' */
- _PU, /* 0x5D 93. ']' */
- _PU, /* 0x5E 94. '^' */
- _PU, /* 0x5F 95. '_' */
- _PU, /* 0x60 96. '`' */
- _XD|_LO, /* 0x61 97. 'a' */
- _XD|_LO, /* 0x62 98. 'b' */
- _XD|_LO, /* 0x63 99. 'c' */
- _XD|_LO, /* 0x64 100. 'd' */
- _XD|_LO, /* 0x65 101. 'e' */
- _XD|_LO, /* 0x66 102. 'f' */
- _LO, /* 0x67 103. 'g' */
- _LO, /* 0x68 104. 'h' */
- _LO, /* 0x69 105. 'i' */
- _LO, /* 0x6A 106. 'j' */
- _LO, /* 0x6B 107. 'k' */
- _LO, /* 0x6C 108. 'l' */
- _LO, /* 0x6D 109. 'm' */
- _LO, /* 0x6E 110. 'n' */
- _LO, /* 0x6F 111. 'o' */
- _LO, /* 0x70 112. 'p' */
- _LO, /* 0x71 113. 'q' */
- _LO, /* 0x72 114. 'r' */
- _LO, /* 0x73 115. 's' */
- _LO, /* 0x74 116. 't' */
- _LO, /* 0x75 117. 'u' */
- _LO, /* 0x76 118. 'v' */
- _LO, /* 0x77 119. 'w' */
- _LO, /* 0x78 120. 'x' */
- _LO, /* 0x79 121. 'y' */
- _LO, /* 0x7A 122. 'z' */
- _PU, /* 0x7B 123. '{' */
- _PU, /* 0x7C 124. '|' */
- _PU, /* 0x7D 125. '}' */
- _PU, /* 0x7E 126. '~' */
- _CN, /* 0x7F 127. */
+#define _ACPI_XA 0x00 /* extra alphabetic - not supported */
+#define _ACPI_XS 0x40 /* extra space */
+#define _ACPI_BB 0x00 /* BEL, BS, etc. - not supported */
+#define _ACPI_CN 0x20 /* CR, FF, HT, NL, VT */
+#define _ACPI_DI 0x04 /* '0'-'9' */
+#define _ACPI_LO 0x02 /* 'a'-'z' */
+#define _ACPI_PU 0x10 /* punctuation */
+#define _ACPI_SP 0x08 /* space */
+#define _ACPI_UP 0x01 /* 'A'-'Z' */
+#define _ACPI_XD 0x80 /* '0'-'9', 'A'-'F', 'a'-'f' */
+
+static const u8 _acpi_ctype[257] = {
+ _ACPI_CN, /* 0x0 0. */
+ _ACPI_CN, /* 0x1 1. */
+ _ACPI_CN, /* 0x2 2. */
+ _ACPI_CN, /* 0x3 3. */
+ _ACPI_CN, /* 0x4 4. */
+ _ACPI_CN, /* 0x5 5. */
+ _ACPI_CN, /* 0x6 6. */
+ _ACPI_CN, /* 0x7 7. */
+ _ACPI_CN, /* 0x8 8. */
+ _ACPI_CN|_ACPI_SP, /* 0x9 9. */
+ _ACPI_CN|_ACPI_SP, /* 0xA 10. */
+ _ACPI_CN|_ACPI_SP, /* 0xB 11. */
+ _ACPI_CN|_ACPI_SP, /* 0xC 12. */
+ _ACPI_CN|_ACPI_SP, /* 0xD 13. */
+ _ACPI_CN, /* 0xE 14. */
+ _ACPI_CN, /* 0xF 15. */
+ _ACPI_CN, /* 0x10 16. */
+ _ACPI_CN, /* 0x11 17. */
+ _ACPI_CN, /* 0x12 18. */
+ _ACPI_CN, /* 0x13 19. */
+ _ACPI_CN, /* 0x14 20. */
+ _ACPI_CN, /* 0x15 21. */
+ _ACPI_CN, /* 0x16 22. */
+ _ACPI_CN, /* 0x17 23. */
+ _ACPI_CN, /* 0x18 24. */
+ _ACPI_CN, /* 0x19 25. */
+ _ACPI_CN, /* 0x1A 26. */
+ _ACPI_CN, /* 0x1B 27. */
+ _ACPI_CN, /* 0x1C 28. */
+ _ACPI_CN, /* 0x1D 29. */
+ _ACPI_CN, /* 0x1E 30. */
+ _ACPI_CN, /* 0x1F 31. */
+ _ACPI_XS|_ACPI_SP, /* 0x20 32. ' ' */
+ _ACPI_PU, /* 0x21 33. '!' */
+ _ACPI_PU, /* 0x22 34. '"' */
+ _ACPI_PU, /* 0x23 35. '#' */
+ _ACPI_PU, /* 0x24 36. '$' */
+ _ACPI_PU, /* 0x25 37. '%' */
+ _ACPI_PU, /* 0x26 38. '&' */
+ _ACPI_PU, /* 0x27 39. ''' */
+ _ACPI_PU, /* 0x28 40. '(' */
+ _ACPI_PU, /* 0x29 41. ')' */
+ _ACPI_PU, /* 0x2A 42. '*' */
+ _ACPI_PU, /* 0x2B 43. '+' */
+ _ACPI_PU, /* 0x2C 44. ',' */
+ _ACPI_PU, /* 0x2D 45. '-' */
+ _ACPI_PU, /* 0x2E 46. '.' */
+ _ACPI_PU, /* 0x2F 47. '/' */
+ _ACPI_XD|_ACPI_DI, /* 0x30 48. '0' */
+ _ACPI_XD|_ACPI_DI, /* 0x31 49. '1' */
+ _ACPI_XD|_ACPI_DI, /* 0x32 50. '2' */
+ _ACPI_XD|_ACPI_DI, /* 0x33 51. '3' */
+ _ACPI_XD|_ACPI_DI, /* 0x34 52. '4' */
+ _ACPI_XD|_ACPI_DI, /* 0x35 53. '5' */
+ _ACPI_XD|_ACPI_DI, /* 0x36 54. '6' */
+ _ACPI_XD|_ACPI_DI, /* 0x37 55. '7' */
+ _ACPI_XD|_ACPI_DI, /* 0x38 56. '8' */
+ _ACPI_XD|_ACPI_DI, /* 0x39 57. '9' */
+ _ACPI_PU, /* 0x3A 58. ':' */
+ _ACPI_PU, /* 0x3B 59. ';' */
+ _ACPI_PU, /* 0x3C 60. '<' */
+ _ACPI_PU, /* 0x3D 61. '=' */
+ _ACPI_PU, /* 0x3E 62. '>' */
+ _ACPI_PU, /* 0x3F 63. '?' */
+ _ACPI_PU, /* 0x40 64. '@' */
+ _ACPI_XD|_ACPI_UP, /* 0x41 65. 'A' */
+ _ACPI_XD|_ACPI_UP, /* 0x42 66. 'B' */
+ _ACPI_XD|_ACPI_UP, /* 0x43 67. 'C' */
+ _ACPI_XD|_ACPI_UP, /* 0x44 68. 'D' */
+ _ACPI_XD|_ACPI_UP, /* 0x45 69. 'E' */
+ _ACPI_XD|_ACPI_UP, /* 0x46 70. 'F' */
+ _ACPI_UP, /* 0x47 71. 'G' */
+ _ACPI_UP, /* 0x48 72. 'H' */
+ _ACPI_UP, /* 0x49 73. 'I' */
+ _ACPI_UP, /* 0x4A 74. 'J' */
+ _ACPI_UP, /* 0x4B 75. 'K' */
+ _ACPI_UP, /* 0x4C 76. 'L' */
+ _ACPI_UP, /* 0x4D 77. 'M' */
+ _ACPI_UP, /* 0x4E 78. 'N' */
+ _ACPI_UP, /* 0x4F 79. 'O' */
+ _ACPI_UP, /* 0x50 80. 'P' */
+ _ACPI_UP, /* 0x51 81. 'Q' */
+ _ACPI_UP, /* 0x52 82. 'R' */
+ _ACPI_UP, /* 0x53 83. 'S' */
+ _ACPI_UP, /* 0x54 84. 'T' */
+ _ACPI_UP, /* 0x55 85. 'U' */
+ _ACPI_UP, /* 0x56 86. 'V' */
+ _ACPI_UP, /* 0x57 87. 'W' */
+ _ACPI_UP, /* 0x58 88. 'X' */
+ _ACPI_UP, /* 0x59 89. 'Y' */
+ _ACPI_UP, /* 0x5A 90. 'Z' */
+ _ACPI_PU, /* 0x5B 91. '[' */
+ _ACPI_PU, /* 0x5C 92. '\' */
+ _ACPI_PU, /* 0x5D 93. ']' */
+ _ACPI_PU, /* 0x5E 94. '^' */
+ _ACPI_PU, /* 0x5F 95. '_' */
+ _ACPI_PU, /* 0x60 96. '`' */
+ _ACPI_XD|_ACPI_LO, /* 0x61 97. 'a' */
+ _ACPI_XD|_ACPI_LO, /* 0x62 98. 'b' */
+ _ACPI_XD|_ACPI_LO, /* 0x63 99. 'c' */
+ _ACPI_XD|_ACPI_LO, /* 0x64 100. 'd' */
+ _ACPI_XD|_ACPI_LO, /* 0x65 101. 'e' */
+ _ACPI_XD|_ACPI_LO, /* 0x66 102. 'f' */
+ _ACPI_LO, /* 0x67 103. 'g' */
+ _ACPI_LO, /* 0x68 104. 'h' */
+ _ACPI_LO, /* 0x69 105. 'i' */
+ _ACPI_LO, /* 0x6A 106. 'j' */
+ _ACPI_LO, /* 0x6B 107. 'k' */
+ _ACPI_LO, /* 0x6C 108. 'l' */
+ _ACPI_LO, /* 0x6D 109. 'm' */
+ _ACPI_LO, /* 0x6E 110. 'n' */
+ _ACPI_LO, /* 0x6F 111. 'o' */
+ _ACPI_LO, /* 0x70 112. 'p' */
+ _ACPI_LO, /* 0x71 113. 'q' */
+ _ACPI_LO, /* 0x72 114. 'r' */
+ _ACPI_LO, /* 0x73 115. 's' */
+ _ACPI_LO, /* 0x74 116. 't' */
+ _ACPI_LO, /* 0x75 117. 'u' */
+ _ACPI_LO, /* 0x76 118. 'v' */
+ _ACPI_LO, /* 0x77 119. 'w' */
+ _ACPI_LO, /* 0x78 120. 'x' */
+ _ACPI_LO, /* 0x79 121. 'y' */
+ _ACPI_LO, /* 0x7A 122. 'z' */
+ _ACPI_PU, /* 0x7B 123. '{' */
+ _ACPI_PU, /* 0x7C 124. '|' */
+ _ACPI_PU, /* 0x7D 125. '}' */
+ _ACPI_PU, /* 0x7E 126. '~' */
+ _ACPI_CN, /* 0x7F 127. */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x80 to 0x8F */
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x90 to 0x9F */
@@ -522,10 +518,10 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* 0xF0 to 0x100 */
};
-#define IS_UPPER(c) (_ctype[(unsigned char)(c)] & (_UP))
-#define IS_LOWER(c) (_ctype[(unsigned char)(c)] & (_LO))
-#define IS_DIGIT(c) (_ctype[(unsigned char)(c)] & (_DI))
-#define IS_SPACE(c) (_ctype[(unsigned char)(c)] & (_SP))
+#define IS_UPPER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_UP))
+#define IS_LOWER(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_LO))
+#define IS_DIGIT(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_DI))
+#define IS_SPACE(c) (_acpi_ctype[(unsigned char)(c)] & (_ACPI_SP))
/*******************************************************************************
@@ -628,7 +624,7 @@
return (NULL);
}
- /* Walk entire string, uppercasing the letters */
+ /* Walk entire string, comparing the letters */
for (string = string1; *string2; ) {
if (*string2 != *string) {
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)