[or-cvs] fix compile complaints (and a bug)

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	dirserv.c router.c 
Log Message:
fix compile complaints (and a bug)


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -d -r1.191 -r1.192
--- dirserv.c	26 Aug 2005 21:28:16 -0000	1.191
+++ dirserv.c	26 Aug 2005 21:30:52 -0000	1.192
@@ -337,7 +337,6 @@
 dirserv_add_descriptor(const char *desc, const char **msg)
 {
   routerinfo_t *ri = NULL;
-  size_t desc_len;
   tor_assert(msg);
   *msg = NULL;
 

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- router.c	26 Aug 2005 21:19:58 -0000	1.197
+++ router.c	26 Aug 2005 21:30:52 -0000	1.198
@@ -329,7 +329,7 @@
       log_fn(LOG_ERR, "Error adding own fingerprint to approved set");
       return -1;
     }
-    if (dirserv_add_descriptor(&tmp, &m) != 1) {
+    if (dirserv_add_descriptor(tmp, &m) != 1) {
       log(LOG_ERR, "Unable to add own descriptor to directory: %s",
           m?m:"<unknown error>");
       return -1;