Wireshark · Ethereal-dev: Re: [Ethereal-dev] packet-x11-keysym.h cleanup

[Motonori Shindo <mshindo@xxxxxxxxxxx>]

Ron and Guy,

As suggested by Ron, looks like hex notation is better.

I also found one possible bug in the original code. 

  { 0x0d0, "\320" }, { 0x0d0, "\321" }, { 0x0d1, "\321" }, { 0x0d2, "\322" }, ...

should be

  { 0x0d0, "\320" }, { 0x0d1, "\321" }, { 0x0d2, "\322" }, { 0x0d3, "\323" }, ...

Attached patch includes octal->hex notation change and a bug fix for
the above problem.

Regards,

=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=
 +----+----+     
 |.. .|    |     Motonori Shindo
 |_~__|    |     
 | .. |~~_~|     Sr. Systems Engineer
 | .  |    |     CoSine Communications Inc.
 +----+----+     
 C o S i n e     e-mail:  mshindo@xxxxxxxxxxxxx 
Communications
=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=--=

? packet-x11-keysym.h.save
Index: packet-x11-keysym.h
===================================================================
RCS file: /cvsroot/ethereal/packet-x11-keysym.h,v
retrieving revision 1.4
diff -u -r1.4 packet-x11-keysym.h
--- packet-x11-keysym.h	2001/10/03 15:13:24	1.4
+++ packet-x11-keysym.h	2001/10/04 08:34:46
@@ -33,31 +33,32 @@
       { 0x073, "s" }, { 0x074, "t" }, { 0x075, "u" }, { 0x076, "v" },
       { 0x077, "w" }, { 0x078, "x" }, { 0x079, "y" }, { 0x07a, "z" },
       { 0x07b, "{" }, { 0x07c, "|" }, { 0x07d, ", HFILL }" }, { 0x07e, "~" },
-      { 0x0a0, "nobreakspace" }, { 0x0a1, "\241" }, { 0x0a2, "\242" }, { 0x0a3, "\243" },
-      { 0x0a4, "\244" }, { 0x0a5, "\245" }, { 0x0a6, "\246" }, { 0x0a7, "\247" },
-      { 0x0a8, "\250" }, { 0x0a9, "\251" }, { 0x0aa, "\252" }, { 0x0ab, "\253" },
-      { 0x0ac, "\254" }, { 0x0ad, "\255" }, { 0x0ae, "\256" }, { 0x0af, "\257" },
-      { 0x0b0, "\260" }, { 0x0b1, "\261" }, { 0x0b2, "\262" }, { 0x0b3, "\263" },
-      { 0x0b4, "\264" }, { 0x0b5, "\265" }, { 0x0b6, "\266" }, { 0x0b7, "\267" },
-      { 0x0b8, "\270" }, { 0x0b9, "\271" }, { 0x0ba, "\272" }, { 0x0bb, "\273" },
-      { 0x0bc, "\274" }, { 0x0bd, "\275" }, { 0x0be, "\276" }, { 0x0bf, "\277" },
-      { 0x0c0, "\300" }, { 0x0c1, "\301" }, { 0x0c2, "\302" }, { 0x0c3, "\303" },
-      { 0x0c4, "\304" }, { 0x0c5, "\305" }, { 0x0c6, "\306" }, { 0x0c7, "\307" },
-      { 0x0c8, "\310" }, { 0x0c9, "\311" }, { 0x0ca, "\312" }, { 0x0cb, "\313" },
-      { 0x0cc, "\314" }, { 0x0cd, "\315" }, { 0x0ce, "\316" }, { 0x0cf, "\317" },
-      { 0x0d0, "\320" }, { 0x0d0, "\321" }, { 0x0d1, "\321" }, { 0x0d2, "\322" },
-      { 0x0d3, "\323" }, { 0x0d4, "\324" }, { 0x0d5, "\325" }, { 0x0d6, "\326" },
-      { 0x0d7, "\327" }, { 0x0d8, "\330" }, { 0x0d9, "\331" }, { 0x0da, "\332" },
-      { 0x0db, "\333" }, { 0x0dc, "\334" }, { 0x0dd, "\335" }, { 0x0de, "\336" },
-      { 0x0df, "\337" }, { 0x0e0, "\340" }, { 0x0e1, "\341" }, { 0x0e2, "\342" },
-      { 0x0e3, "\343" }, { 0x0e4, "\344" }, { 0x0e5, "\345" }, { 0x0e6, "\346" },
-      { 0x0e7, "\347" }, { 0x0e8, "\350" }, { 0x0e9, "\351" }, { 0x0ea, "\352" },
-      { 0x0eb, "\353" }, { 0x0ec, "\354" }, { 0x0ed, "\355" }, { 0x0ee, "\356" },
-      { 0x0ef, "\357" }, { 0x0f0, "\360" }, { 0x0f1, "\361" }, { 0x0f2, "\362" },
-      { 0x0f3, "\363" }, { 0x0f4, "\364" }, { 0x0f5, "\365" }, { 0x0f6, "\366" },
-      { 0x0f7, "\367" }, { 0x0f8, "\370" }, { 0x0f9, "\371" }, { 0x0fa, "\372" },
-      { 0x0fb, "\373" }, { 0x0fc, "\374" }, { 0x0fd, "\375" }, { 0x0fe, "\376" },
-      { 0x0ff, "\377" }, { 0x13bc, "OE" }, { 0x13bd, "oe" }, { 0x13be, "Ydiaeresis" },
+      { 0x0a0, "nobreakspace" }, { 0x0a1, "\x0a1" }, { 0x0a2, "\x0a2" }, { 0x0a3, "\x0a3" },
+      { 0x0a4, "\x0a4" }, { 0x0a5, "\x0a5" }, { 0x0a6, "\x0a6" }, { 0x0a7, "\x0a7" },
+      { 0x0a8, "\x0a8" }, { 0x0a9, "\x0a9" }, { 0x0aa, "\x0aa" }, { 0x0ab, "\x0ab" },
+      { 0x0ac, "\x0ac" }, { 0x0ad, "\x0ad" }, { 0x0ae, "\x0ae" }, { 0x0af, "\x0af" },
+      { 0x0b0, "\x0b0" }, { 0x0b1, "\x0b1" }, { 0x0b2, "\x0b2" }, { 0x0b3, "\x0b3" },
+      { 0x0b4, "\x0b4" }, { 0x0b5, "\x0b5" }, { 0x0b6, "\x0b6" }, { 0x0b7, "\x0b7" },
+      { 0x0b8, "\x0b8" }, { 0x0b9, "\x0b9" }, { 0x0ba, "\x0ba" }, { 0x0bb, "\x0bb" },
+      { 0x0bc, "\x0bc" }, { 0x0bd, "\x0bd" }, { 0x0be, "\x0be" }, { 0x0bf, "\x0bf" },
+      { 0x0c0, "\x0c0" }, { 0x0c1, "\x0c1" }, { 0x0c2, "\x0c2" }, { 0x0c3, "\x0c3" },
+      { 0x0c4, "\x0c4" }, { 0x0c5, "\x0c5" }, { 0x0c6, "\x0c6" }, { 0x0c7, "\x0c7" },
+      { 0x0c8, "\x0c8" }, { 0x0c9, "\x0c9" }, { 0x0ca, "\x0ca" }, { 0x0cb, "\x0cb" },
+      { 0x0cc, "\x0cc" }, { 0x0cd, "\x0cd" }, { 0x0ce, "\x0ce" }, { 0x0cf, "\x0cf" },
+
+      { 0x0d0, "\x0d0" }, { 0x0d1, "\x0d1" }, { 0x0d2, "\x0d2" }, { 0x0d3, "\x0d3" }, 
+      { 0x0d4, "\x0d4" }, { 0x0d5, "\x0d5" }, { 0x0d6, "\x0d6" }, { 0x0d7, "\x0d7" }, 
+      { 0x0d8, "\x0d8" }, { 0x0d9, "\x0d9" }, { 0x0da, "\x0da" }, { 0x0db, "\x0db" }, 
+      { 0x0dc, "\x0dc" }, { 0x0dd, "\x0dd" }, { 0x0de, "\x0de" }, { 0x0df, "\x0df" }, 
+      { 0x0e0, "\x0e0" }, { 0x0e1, "\x0e1" }, { 0x0e2, "\x0e2" }, { 0x0e3, "\x0e3" }, 
+      { 0x0e4, "\x0e4" }, { 0x0e5, "\x0e5" }, { 0x0e6, "\x0e6" }, { 0x0e7, "\x0e7" }, 
+      { 0x0e8, "\x0e8" }, { 0x0e9, "\x0e9" }, { 0x0ea, "\x0ea" }, { 0x0eb, "\x0eb" }, 
+      { 0x0ec, "\x0ec" }, { 0x0ed, "\x0ed" }, { 0x0ee, "\x0ee" }, { 0x0ef, "\x0ef" }, 
+      { 0x0f0, "\x0f0" }, { 0x0f1, "\x0f1" }, { 0x0f2, "\x0f2" }, { 0x0f3, "\x0f3" }, 
+      { 0x0f4, "\x0f4" }, { 0x0f5, "\x0f5" }, { 0x0f6, "\x0f6" }, { 0x0f7, "\x0f7" }, 
+      { 0x0f8, "\x0f8" }, { 0x0f9, "\x0f9" }, { 0x0fa, "\x0fa" }, { 0x0fb, "\x0fb" }, 
+      { 0x0fc, "\x0fc" }, { 0x0fd, "\x0fd" }, { 0x0fe, "\x0fe" }, { 0x0ff, "\x0ff" }, 
+      { 0x13bc, "OE" }, { 0x13bd, "oe" }, { 0x13be, "Ydiaeresis" },
       { 0x1a1, "Aogonek" }, { 0x1a2, "breve" }, { 0x1a3, "Lstroke" }, { 0x1a5, "Lcaron" },
       { 0x1a6, "Sacute" }, { 0x1a9, "Scaron" }, { 0x1aa, "Scedilla" }, { 0x1ab, "Tcaron" },
       { 0x1ac, "Zacute" }, { 0x1ae, "Zcaron" }, { 0x1af, "Zabovedot" }, { 0x1b1, "aogonek" },