[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[or-cvs] resolve warnings



Update of /home/or/cvsroot/src/or
In directory moria.seul.org:/home/arma/work/onion/cvs/src/or

Modified Files:
	config.c connection.c connection_op.c connection_or.c 
Log Message:
resolve warnings


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- config.c	3 Sep 2002 18:44:23 -0000	1.14
+++ config.c	3 Sep 2002 19:03:16 -0000	1.15
@@ -68,7 +68,7 @@
    int Verbose;
    int code;
    poptContext optCon;
-   char *cmd;
+   const char *cmd;
    struct poptOption opt_tab[] =
    {
       { "APPort",          'a',  POPT_ARG_INT,     &options->APPort,

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- connection.c	3 Sep 2002 18:36:40 -0000	1.17
+++ connection.c	3 Sep 2002 19:03:16 -0000	1.18
@@ -522,7 +522,7 @@
   printf("\n");
 #endif
 
-  if(crypto_cipher_encrypt(conn->f_crypto, (char *)cellp, sizeof(cell_t), &newcell)) {
+  if(crypto_cipher_encrypt(conn->f_crypto, (char *)cellp, sizeof(cell_t), (char *)&newcell)) {
     log(LOG_ERR,"Could not encrypt cell for connection %s:%u.",conn->address,conn->port);
     return -1;
   }

Index: connection_op.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_op.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- connection_op.c	24 Aug 2002 06:58:24 -0000	1.7
+++ connection_op.c	3 Sep 2002 19:03:16 -0000	1.8
@@ -32,7 +32,7 @@
 
 int op_handshake_process_keys(connection_t *conn) {
   int retval;
-  int x;
+  //int x;
   unsigned char iv[16];
 
   /* key exchange message */

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- connection_or.c	24 Aug 2002 07:55:49 -0000	1.10
+++ connection_or.c	3 Sep 2002 19:03:16 -0000	1.11
@@ -111,7 +111,7 @@
 /*********************/
 
 void conn_or_init_crypto(connection_t *conn) {
-  int x;
+  //int x;
   unsigned char iv[16];
 
   assert(conn);
@@ -257,7 +257,7 @@
 }
 
 int or_handshake_op_send_keys(connection_t *conn) {
-  int x;
+  //int x;
   uint32_t bandwidth = DEFAULT_BANDWIDTH_OP;
   unsigned char message[20]; /* bandwidth(32bits), forward key(64bits), backward key(64bits) */
   unsigned char cipher[128];