[or-cvs] r8950: Fix some more mipspro warnings. Nothing should remain excecp (in tor/trunk: . src/or)

nickm at seul.org nickm at seul.org
Tue Nov 14 03:45:49 UTC 2006


Author: nickm
Date: 2006-11-13 22:45:48 -0500 (Mon, 13 Nov 2006)
New Revision: 8950

Modified:
   tor/trunk/
   tor/trunk/src/or/buffers.c
   tor/trunk/src/or/directory.c
Log:
 r9317 at totoro:  nickm | 2006-11-13 22:45:33 -0500
 Fix some more mipspro warnings.  Nothing should remain excecpt "conversion from pointer to same-sized integral type."



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r9317] on 96637b51-b116-0410-a10e-9941ebb49b64

Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c	2006-11-14 03:41:05 UTC (rev 8949)
+++ tor/trunk/src/or/buffers.c	2006-11-14 03:45:48 UTC (rev 8950)
@@ -187,7 +187,7 @@
        * to move the start portion back by that many bytes.
        */
       memmove(buf->cur-(buf->len-new_capacity), buf->cur,
-              buf->len-offset);
+              (size_t)(buf->len-offset));
       offset -= (buf->len-new_capacity);
     } else {
       /* The data doesn't wrap around, but it does extend beyond the new
@@ -232,7 +232,7 @@
      * end portion forward by that many bytes.
      */
     memmove(buf->cur+(new_capacity-buf->len), buf->cur,
-            buf->len-offset);
+            (size_t)(buf->len-offset));
     buf->cur += new_capacity-buf->len;
   }
   buf->memsize = buf->len = new_capacity;

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2006-11-14 03:41:05 UTC (rev 8949)
+++ tor/trunk/src/or/directory.c	2006-11-14 03:45:48 UTC (rev 8950)
@@ -907,6 +907,7 @@
                 "we are %d seconds skewed.  (That's okay.)", delta);
     }
   }
+  (void) skewed; /* skewed isn't used yet. */
 
   if (status_code == 503) {
     log_info(LD_DIR,"Received http status code %d (%s) from server "
@@ -1576,6 +1577,7 @@
       return 0;
     }
     // note_request(request_type,dlen);
+    (void) request_type;
     write_http_response_header(conn, -1,
                  deflated?"application/octet_stream":"text/plain",
                  deflated?"deflate":NULL,
@@ -1622,6 +1624,7 @@
     } else {
       request_type = "/tor/server/?";
     }
+    (void) request_type; /* usable for note_request. */
     if (!strcmpstart(url, "/tor/server/d/"))
       conn->dir_spool_src = DIR_SPOOL_SERVER_BY_DIGEST;
     else



More information about the tor-commits mailing list