From: Peter H. Froehlich <peter.hans.froehlich@gmail.com>
Date: Sun, 18 Oct 2015 06:54:19 +0000 (-0400)
Subject: Modernized array initializer syntax.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=3d41fcbc7d52bc570e85956c1fb2d18dff9f85b9;p=xv6-public

Modernized array initializer syntax.
---

diff --git a/kbd.h b/kbd.h
index babbd6e..fe8b7bd 100644
--- a/kbd.h
+++ b/kbd.h
@@ -33,19 +33,19 @@
 
 static uchar shiftcode[256] =
 {
-  [0x1D] CTL,
-  [0x2A] SHIFT,
-  [0x36] SHIFT,
-  [0x38] ALT,
-  [0x9D] CTL,
-  [0xB8] ALT
+  [0x1D] = CTL,
+  [0x2A] = SHIFT,
+  [0x36] = SHIFT,
+  [0x38] = ALT,
+  [0x9D] = CTL,
+  [0xB8] = ALT
 };
 
 static uchar togglecode[256] =
 {
-  [0x3A] CAPSLOCK,
-  [0x45] NUMLOCK,
-  [0x46] SCROLLLOCK
+  [0x3A] = CAPSLOCK,
+  [0x45] = NUMLOCK,
+  [0x46] = SCROLLLOCK
 };
 
 static uchar normalmap[256] =
@@ -61,13 +61,13 @@ static uchar normalmap[256] =
   NO,   NO,   NO,   NO,   NO,   NO,   NO,   '7',  // 0x40
   '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1',
   '2',  '3',  '0',  '.',  NO,   NO,   NO,   NO,   // 0x50
-  [0x9C] '\n',      // KP_Enter
-  [0xB5] '/',       // KP_Div
-  [0xC8] KEY_UP,    [0xD0] KEY_DN,
-  [0xC9] KEY_PGUP,  [0xD1] KEY_PGDN,
-  [0xCB] KEY_LF,    [0xCD] KEY_RT,
-  [0x97] KEY_HOME,  [0xCF] KEY_END,
-  [0xD2] KEY_INS,   [0xD3] KEY_DEL
+  [0x9C] = '\n',      // KP_Enter
+  [0xB5] = '/',       // KP_Div
+  [0xC8] = KEY_UP,    [0xD0] = KEY_DN,
+  [0xC9] = KEY_PGUP,  [0xD1] = KEY_PGDN,
+  [0xCB] = KEY_LF,    [0xCD] = KEY_RT,
+  [0x97] = KEY_HOME,  [0xCF] = KEY_END,
+  [0xD2] = KEY_INS,   [0xD3] = KEY_DEL
 };
 
 static uchar shiftmap[256] =
@@ -83,13 +83,13 @@ static uchar shiftmap[256] =
   NO,   NO,   NO,   NO,   NO,   NO,   NO,   '7',  // 0x40
   '8',  '9',  '-',  '4',  '5',  '6',  '+',  '1',
   '2',  '3',  '0',  '.',  NO,   NO,   NO,   NO,   // 0x50
-  [0x9C] '\n',      // KP_Enter
-  [0xB5] '/',       // KP_Div
-  [0xC8] KEY_UP,    [0xD0] KEY_DN,
-  [0xC9] KEY_PGUP,  [0xD1] KEY_PGDN,
-  [0xCB] KEY_LF,    [0xCD] KEY_RT,
-  [0x97] KEY_HOME,  [0xCF] KEY_END,
-  [0xD2] KEY_INS,   [0xD3] KEY_DEL
+  [0x9C] = '\n',      // KP_Enter
+  [0xB5] = '/',       // KP_Div
+  [0xC8] = KEY_UP,    [0xD0] = KEY_DN,
+  [0xC9] = KEY_PGUP,  [0xD1] = KEY_PGDN,
+  [0xCB] = KEY_LF,    [0xCD] = KEY_RT,
+  [0x97] = KEY_HOME,  [0xCF] = KEY_END,
+  [0xD2] = KEY_INS,   [0xD3] = KEY_DEL
 };
 
 static uchar ctlmap[256] =
@@ -101,12 +101,12 @@ static uchar ctlmap[256] =
   C('D'),  C('F'),  C('G'),  C('H'),  C('J'),  C('K'),  C('L'),  NO,
   NO,      NO,      NO,      C('\\'), C('Z'),  C('X'),  C('C'),  C('V'),
   C('B'),  C('N'),  C('M'),  NO,      NO,      C('/'),  NO,      NO,
-  [0x9C] '\r',      // KP_Enter
-  [0xB5] C('/'),    // KP_Div
-  [0xC8] KEY_UP,    [0xD0] KEY_DN,
-  [0xC9] KEY_PGUP,  [0xD1] KEY_PGDN,
-  [0xCB] KEY_LF,    [0xCD] KEY_RT,
-  [0x97] KEY_HOME,  [0xCF] KEY_END,
-  [0xD2] KEY_INS,   [0xD3] KEY_DEL
+  [0x9C] = '\r',      // KP_Enter
+  [0xB5] = C('/'),    // KP_Div
+  [0xC8] = KEY_UP,    [0xD0] = KEY_DN,
+  [0xC9] = KEY_PGUP,  [0xD1] = KEY_PGDN,
+  [0xCB] = KEY_LF,    [0xCD] = KEY_RT,
+  [0x97] = KEY_HOME,  [0xCF] = KEY_END,
+  [0xD2] = KEY_INS,   [0xD3] = KEY_DEL
 };
 
diff --git a/proc.c b/proc.c
index d983233..f60d6dd 100644
--- a/proc.c
+++ b/proc.c
@@ -435,12 +435,12 @@ void
 procdump(void)
 {
   static char *states[] = {
-  [UNUSED]    "unused",
-  [EMBRYO]    "embryo",
-  [SLEEPING]  "sleep ",
-  [RUNNABLE]  "runble",
-  [RUNNING]   "run   ",
-  [ZOMBIE]    "zombie"
+    [UNUSED]   = "unused",
+    [EMBRYO]   = "embryo",
+    [SLEEPING] = "sleep ",
+    [RUNNABLE] = "runble",
+    [RUNNING]  = "run   ",
+    [ZOMBIE]   = "zombie"
   };
   int i;
   struct proc *p;
diff --git a/syscall.c b/syscall.c
index 9ef66a1..a44d17f 100644
--- a/syscall.c
+++ b/syscall.c
@@ -99,27 +99,27 @@ extern int sys_write(void);
 extern int sys_uptime(void);
 
 static int (*syscalls[])(void) = {
-[SYS_fork]    sys_fork,
-[SYS_exit]    sys_exit,
-[SYS_wait]    sys_wait,
-[SYS_pipe]    sys_pipe,
-[SYS_read]    sys_read,
-[SYS_kill]    sys_kill,
-[SYS_exec]    sys_exec,
-[SYS_fstat]   sys_fstat,
-[SYS_chdir]   sys_chdir,
-[SYS_dup]     sys_dup,
-[SYS_getpid]  sys_getpid,
-[SYS_sbrk]    sys_sbrk,
-[SYS_sleep]   sys_sleep,
-[SYS_uptime]  sys_uptime,
-[SYS_open]    sys_open,
-[SYS_write]   sys_write,
-[SYS_mknod]   sys_mknod,
-[SYS_unlink]  sys_unlink,
-[SYS_link]    sys_link,
-[SYS_mkdir]   sys_mkdir,
-[SYS_close]   sys_close,
+  [SYS_fork]   = sys_fork,
+  [SYS_exit]   = sys_exit,
+  [SYS_wait]   = sys_wait,
+  [SYS_pipe]   = sys_pipe,
+  [SYS_read]   = sys_read,
+  [SYS_kill]   = sys_kill,
+  [SYS_exec]   = sys_exec,
+  [SYS_fstat]  = sys_fstat,
+  [SYS_chdir]  = sys_chdir,
+  [SYS_dup]    = sys_dup,
+  [SYS_getpid] = sys_getpid,
+  [SYS_sbrk]   = sys_sbrk,
+  [SYS_sleep]  = sys_sleep,
+  [SYS_uptime] = sys_uptime,
+  [SYS_open]   = sys_open,
+  [SYS_write]  = sys_write,
+  [SYS_mknod]  = sys_mknod,
+  [SYS_unlink] = sys_unlink,
+  [SYS_link]   = sys_link,
+  [SYS_mkdir]  = sys_mkdir,
+  [SYS_close]  = sys_close,
 };
 
 void