[Qemu-devel] [5172] Some little fixes on QEMU

[Aurelien Jarno]

Revision: 5172
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5172
Author:   aurel32
Date:     2008-09-06 16:31:30 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
Some little fixes on QEMU

- some vectors can be declared as "const"
- test on CONFIG_VNC_TLS is done for two times while just one is enough.

(Carlo Bramini)

Modified Paths:
--------------
    trunk/d3des.c
    trunk/vgafont.h
    trunk/vnc.c

Modified: trunk/d3des.c
===================================================================
--- trunk/d3des.c       2008-09-05 19:07:53 UTC (rev 5171)
+++ trunk/d3des.c       2008-09-06 16:31:30 UTC (rev 5172)
@@ -35,10 +35,10 @@
 
 static unsigned long KnL[32] = { 0L };
 
-static unsigned short bytebit[8]       = {
+static const unsigned short bytebit[8] = {
        01, 02, 04, 010, 020, 040, 0100, 0200 };
 
-static unsigned long bigbyte[24] = {
+static const unsigned long bigbyte[24] = {
        0x800000L,      0x400000L,      0x200000L,      0x100000L,
        0x80000L,       0x40000L,       0x20000L,       0x10000L,
        0x8000L,        0x4000L,        0x2000L,        0x1000L,
@@ -48,16 +48,16 @@
 
 /* Use the key schedule specified in the Standard (ANSI X3.92-1981). */
 
-static unsigned char pc1[56] = {
+static const unsigned char pc1[56] = {
        56, 48, 40, 32, 24, 16,  8,      0, 57, 49, 41, 33, 25, 17,
         9,  1, 58, 50, 42, 34, 26,     18, 10,  2, 59, 51, 43, 35,
        62, 54, 46, 38, 30, 22, 14,      6, 61, 53, 45, 37, 29, 21,
        13,  5, 60, 52, 44, 36, 28,     20, 12,  4, 27, 19, 11,  3 };
 
-static unsigned char totrot[16] = {
+static const unsigned char totrot[16] = {
        1,2,4,6,8,10,12,14,15,17,19,21,23,25,27,28 };
 
-static unsigned char pc2[48] = {
+static const unsigned char pc2[48] = {
        13, 16, 10, 23,  0,  4,  2, 27, 14,  5, 20,  9,
        22, 18, 11,  3, 25,  7, 15,  6, 26, 19, 12,  1,
        40, 51, 30, 36, 46, 54, 29, 39, 50, 44, 32, 47,

Modified: trunk/vgafont.h
===================================================================
--- trunk/vgafont.h     2008-09-05 19:07:53 UTC (rev 5171)
+++ trunk/vgafont.h     2008-09-06 16:31:30 UTC (rev 5172)
@@ -1,4 +1,4 @@
-static uint8_t vgafont16[256 * 16] = {
+static const uint8_t vgafont16[256 * 16] = {
 
        /* 0 0x00 '^@' */
        0x00, /* 00000000 */

Modified: trunk/vnc.c
===================================================================
--- trunk/vnc.c 2008-09-05 19:07:53 UTC (rev 5171)
+++ trunk/vnc.c 2008-09-06 16:31:30 UTC (rev 5172)
@@ -109,12 +109,10 @@
     VNC_AUTH_VENCRYPT_X509PLAIN = 262,
 };
 
-#if CONFIG_VNC_TLS
 #define X509_CA_CERT_FILE "ca-cert.pem"
 #define X509_CA_CRL_FILE "ca-crl.pem"
 #define X509_SERVER_KEY_FILE "server-key.pem"
 #define X509_SERVER_CERT_FILE "server-cert.pem"
-#endif
 
 #endif /* CONFIG_VNC_TLS */