resolve warnings

svn:r89

diff --git a/src/or/config.c b/src/or/config.c
index dc1a03c4400d5e165cb01f5f16da99d0d9ed9be6..11839469ad2406af4cc583385e2ff5a7b4fc711c 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -68,7 +68,7 @@ RETURN VALUE: 0 on success, non-zero on error
    int Verbose;
    int code;
    poptContext optCon;
-   char *cmd;
+   const char *cmd;
    struct poptOption opt_tab[] =
    {
       { "APPort",          'a',  POPT_ARG_INT,     &options->APPort,

diff --git a/src/or/connection.c b/src/or/connection.c
index a6acc003dda3abf82b7be614ddee372e23770dde..74d82df42832c2eb3de3e32651eee469069b1f56 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -522,7 +522,7 @@ int connection_encrypt_cell(cell_t *cellp, connection_t *conn) {
   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;
   }

diff --git a/src/or/connection_op.c b/src/or/connection_op.c
index 5a70b7419c35efab5548ff1bb74c7c3fd11d6583..4ead87e84c3aa9979cf652922c102ce0984708db 100644 (file)
--- a/src/or/connection_op.c
+++ b/src/or/connection_op.c
@@ -32,7 +32,7 @@ int connection_op_process_inbuf(connection_t *conn) {
 
 int op_handshake_process_keys(connection_t *conn) {
   int retval;
-  int x;
+  //int x;
   unsigned char iv[16];
 
   /* key exchange message */

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 89c061f98e3ba5fc803d07a048f3024a26d24e6d..9b0518b0ee394d26ee96c7f75a285900d2293613 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -111,7 +111,7 @@ int connection_or_finished_flushing(connection_t *conn) {
 /*********************/
 
 void conn_or_init_crypto(connection_t *conn) {
-  int x;
+  //int x;
   unsigned char iv[16];
 
   assert(conn);
@@ -257,7 +257,7 @@ connection_t *connection_or_connect_as_op(routerinfo_t *router, crypto_pk_env_t
 }
 
 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];