tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Fix default compose table initialization

Oddly enough, unsigned int c = '\300'; puts a "negative" value in c, not
0300... This fixes the default unicode compose table by using integers
instead of character constants.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Samuel Thibault and committed by
Linus Torvalds 5ce2087e cad226b8

+70 -70
+34 -34
drivers/acorn/char/defkeymap-l7200.c
··· 347 347 }; 348 348 349 349 struct kbdiacruc accent_table[MAX_DIACR] = { 350 - {'`', 'A', '\300'}, {'`', 'a', '\340'}, 351 - {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, 352 - {'^', 'A', '\302'}, {'^', 'a', '\342'}, 353 - {'~', 'A', '\303'}, {'~', 'a', '\343'}, 354 - {'"', 'A', '\304'}, {'"', 'a', '\344'}, 355 - {'O', 'A', '\305'}, {'o', 'a', '\345'}, 356 - {'0', 'A', '\305'}, {'0', 'a', '\345'}, 357 - {'A', 'A', '\305'}, {'a', 'a', '\345'}, 358 - {'A', 'E', '\306'}, {'a', 'e', '\346'}, 359 - {',', 'C', '\307'}, {',', 'c', '\347'}, 360 - {'`', 'E', '\310'}, {'`', 'e', '\350'}, 361 - {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, 362 - {'^', 'E', '\312'}, {'^', 'e', '\352'}, 363 - {'"', 'E', '\313'}, {'"', 'e', '\353'}, 364 - {'`', 'I', '\314'}, {'`', 'i', '\354'}, 365 - {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, 366 - {'^', 'I', '\316'}, {'^', 'i', '\356'}, 367 - {'"', 'I', '\317'}, {'"', 'i', '\357'}, 368 - {'-', 'D', '\320'}, {'-', 'd', '\360'}, 369 - {'~', 'N', '\321'}, {'~', 'n', '\361'}, 370 - {'`', 'O', '\322'}, {'`', 'o', '\362'}, 371 - {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, 372 - {'^', 'O', '\324'}, {'^', 'o', '\364'}, 373 - {'~', 'O', '\325'}, {'~', 'o', '\365'}, 374 - {'"', 'O', '\326'}, {'"', 'o', '\366'}, 375 - {'/', 'O', '\330'}, {'/', 'o', '\370'}, 376 - {'`', 'U', '\331'}, {'`', 'u', '\371'}, 377 - {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, 378 - {'^', 'U', '\333'}, {'^', 'u', '\373'}, 379 - {'"', 'U', '\334'}, {'"', 'u', '\374'}, 380 - {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, 381 - {'T', 'H', '\336'}, {'t', 'h', '\376'}, 382 - {'s', 's', '\337'}, {'"', 'y', '\377'}, 383 - {'s', 'z', '\337'}, {'i', 'j', '\377'}, 350 + {'`', 'A', 0300}, {'`', 'a', 0340}, 351 + {'\'', 'A', 0301}, {'\'', 'a', 0341}, 352 + {'^', 'A', 0302}, {'^', 'a', 0342}, 353 + {'~', 'A', 0303}, {'~', 'a', 0343}, 354 + {'"', 'A', 0304}, {'"', 'a', 0344}, 355 + {'O', 'A', 0305}, {'o', 'a', 0345}, 356 + {'0', 'A', 0305}, {'0', 'a', 0345}, 357 + {'A', 'A', 0305}, {'a', 'a', 0345}, 358 + {'A', 'E', 0306}, {'a', 'e', 0346}, 359 + {',', 'C', 0307}, {',', 'c', 0347}, 360 + {'`', 'E', 0310}, {'`', 'e', 0350}, 361 + {'\'', 'E', 0311}, {'\'', 'e', 0351}, 362 + {'^', 'E', 0312}, {'^', 'e', 0352}, 363 + {'"', 'E', 0313}, {'"', 'e', 0353}, 364 + {'`', 'I', 0314}, {'`', 'i', 0354}, 365 + {'\'', 'I', 0315}, {'\'', 'i', 0355}, 366 + {'^', 'I', 0316}, {'^', 'i', 0356}, 367 + {'"', 'I', 0317}, {'"', 'i', 0357}, 368 + {'-', 'D', 0320}, {'-', 'd', 0360}, 369 + {'~', 'N', 0321}, {'~', 'n', 0361}, 370 + {'`', 'O', 0322}, {'`', 'o', 0362}, 371 + {'\'', 'O', 0323}, {'\'', 'o', 0363}, 372 + {'^', 'O', 0324}, {'^', 'o', 0364}, 373 + {'~', 'O', 0325}, {'~', 'o', 0365}, 374 + {'"', 'O', 0326}, {'"', 'o', 0366}, 375 + {'/', 'O', 0330}, {'/', 'o', 0370}, 376 + {'`', 'U', 0331}, {'`', 'u', 0371}, 377 + {'\'', 'U', 0332}, {'\'', 'u', 0372}, 378 + {'^', 'U', 0333}, {'^', 'u', 0373}, 379 + {'"', 'U', 0334}, {'"', 'u', 0374}, 380 + {'\'', 'Y', 0335}, {'\'', 'y', 0375}, 381 + {'T', 'H', 0336}, {'t', 'h', 0376}, 382 + {'s', 's', 0337}, {'"', 'y', 0377}, 383 + {'s', 'z', 0337}, {'i', 'j', 0377}, 384 384 }; 385 385 386 386 unsigned int accent_table_size = 68;
+34 -34
drivers/char/defkeymap.c_shipped
··· 223 223 }; 224 224 225 225 struct kbdiacruc accent_table[MAX_DIACR] = { 226 - {'`', 'A', '\300'}, {'`', 'a', '\340'}, 227 - {'\'', 'A', '\301'}, {'\'', 'a', '\341'}, 228 - {'^', 'A', '\302'}, {'^', 'a', '\342'}, 229 - {'~', 'A', '\303'}, {'~', 'a', '\343'}, 230 - {'"', 'A', '\304'}, {'"', 'a', '\344'}, 231 - {'O', 'A', '\305'}, {'o', 'a', '\345'}, 232 - {'0', 'A', '\305'}, {'0', 'a', '\345'}, 233 - {'A', 'A', '\305'}, {'a', 'a', '\345'}, 234 - {'A', 'E', '\306'}, {'a', 'e', '\346'}, 235 - {',', 'C', '\307'}, {',', 'c', '\347'}, 236 - {'`', 'E', '\310'}, {'`', 'e', '\350'}, 237 - {'\'', 'E', '\311'}, {'\'', 'e', '\351'}, 238 - {'^', 'E', '\312'}, {'^', 'e', '\352'}, 239 - {'"', 'E', '\313'}, {'"', 'e', '\353'}, 240 - {'`', 'I', '\314'}, {'`', 'i', '\354'}, 241 - {'\'', 'I', '\315'}, {'\'', 'i', '\355'}, 242 - {'^', 'I', '\316'}, {'^', 'i', '\356'}, 243 - {'"', 'I', '\317'}, {'"', 'i', '\357'}, 244 - {'-', 'D', '\320'}, {'-', 'd', '\360'}, 245 - {'~', 'N', '\321'}, {'~', 'n', '\361'}, 246 - {'`', 'O', '\322'}, {'`', 'o', '\362'}, 247 - {'\'', 'O', '\323'}, {'\'', 'o', '\363'}, 248 - {'^', 'O', '\324'}, {'^', 'o', '\364'}, 249 - {'~', 'O', '\325'}, {'~', 'o', '\365'}, 250 - {'"', 'O', '\326'}, {'"', 'o', '\366'}, 251 - {'/', 'O', '\330'}, {'/', 'o', '\370'}, 252 - {'`', 'U', '\331'}, {'`', 'u', '\371'}, 253 - {'\'', 'U', '\332'}, {'\'', 'u', '\372'}, 254 - {'^', 'U', '\333'}, {'^', 'u', '\373'}, 255 - {'"', 'U', '\334'}, {'"', 'u', '\374'}, 256 - {'\'', 'Y', '\335'}, {'\'', 'y', '\375'}, 257 - {'T', 'H', '\336'}, {'t', 'h', '\376'}, 258 - {'s', 's', '\337'}, {'"', 'y', '\377'}, 259 - {'s', 'z', '\337'}, {'i', 'j', '\377'}, 226 + {'`', 'A', 0300}, {'`', 'a', 0340}, 227 + {'\'', 'A', 0301}, {'\'', 'a', 0341}, 228 + {'^', 'A', 0302}, {'^', 'a', 0342}, 229 + {'~', 'A', 0303}, {'~', 'a', 0343}, 230 + {'"', 'A', 0304}, {'"', 'a', 0344}, 231 + {'O', 'A', 0305}, {'o', 'a', 0345}, 232 + {'0', 'A', 0305}, {'0', 'a', 0345}, 233 + {'A', 'A', 0305}, {'a', 'a', 0345}, 234 + {'A', 'E', 0306}, {'a', 'e', 0346}, 235 + {',', 'C', 0307}, {',', 'c', 0347}, 236 + {'`', 'E', 0310}, {'`', 'e', 0350}, 237 + {'\'', 'E', 0311}, {'\'', 'e', 0351}, 238 + {'^', 'E', 0312}, {'^', 'e', 0352}, 239 + {'"', 'E', 0313}, {'"', 'e', 0353}, 240 + {'`', 'I', 0314}, {'`', 'i', 0354}, 241 + {'\'', 'I', 0315}, {'\'', 'i', 0355}, 242 + {'^', 'I', 0316}, {'^', 'i', 0356}, 243 + {'"', 'I', 0317}, {'"', 'i', 0357}, 244 + {'-', 'D', 0320}, {'-', 'd', 0360}, 245 + {'~', 'N', 0321}, {'~', 'n', 0361}, 246 + {'`', 'O', 0322}, {'`', 'o', 0362}, 247 + {'\'', 'O', 0323}, {'\'', 'o', 0363}, 248 + {'^', 'O', 0324}, {'^', 'o', 0364}, 249 + {'~', 'O', 0325}, {'~', 'o', 0365}, 250 + {'"', 'O', 0326}, {'"', 'o', 0366}, 251 + {'/', 'O', 0330}, {'/', 'o', 0370}, 252 + {'`', 'U', 0331}, {'`', 'u', 0371}, 253 + {'\'', 'U', 0332}, {'\'', 'u', 0372}, 254 + {'^', 'U', 0333}, {'^', 'u', 0373}, 255 + {'"', 'U', 0334}, {'"', 'u', 0374}, 256 + {'\'', 'Y', 0335}, {'\'', 'y', 0375}, 257 + {'T', 'H', 0336}, {'t', 'h', 0376}, 258 + {'s', 's', 0337}, {'"', 'y', 0377}, 259 + {'s', 'z', 0337}, {'i', 'j', 0377}, 260 260 }; 261 261 262 262 unsigned int accent_table_size = 68;
+2 -2
drivers/s390/char/defkeymap.c
··· 151 151 }; 152 152 153 153 struct kbdiacruc accent_table[MAX_DIACR] = { 154 - {'^', 'c', '\003'}, {'^', 'd', '\004'}, 155 - {'^', 'z', '\032'}, {'^', '\012', '\000'}, 154 + {'^', 'c', 0003}, {'^', 'd', 0004}, 155 + {'^', 'z', 0032}, {'^', 0012', 0000}, 156 156 }; 157 157 158 158 unsigned int accent_table_size = 4;