[or-cvs] cut out a warning that doesn"t need to warn

arma at seul.org arma at seul.org
Sun Oct 16 19:47:03 UTC 2005


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

Modified Files:
	main.c 
Log Message:
cut out a warning that doesn't need to warn


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.577
retrieving revision 1.578
diff -u -d -r1.577 -r1.578
--- main.c	14 Oct 2005 02:26:12 -0000	1.577
+++ main.c	16 Oct 2005 19:47:01 -0000	1.578
@@ -983,15 +983,13 @@
     /* Write out a fresh descriptor, but leave old one on failure. */
     router_rebuild_descriptor(1);
     descriptor = router_get_my_descriptor();
-    if (!descriptor) {
-      log_fn(LOG_WARN,"No descriptor to save.");
-      return 0;
-    }
-    tor_snprintf(keydir,sizeof(keydir),"%s/router.desc",
-                 options->DataDirectory);
-    log_fn(LOG_INFO,"Saving descriptor to \"%s\"...",keydir);
-    if (write_str_to_file(keydir, descriptor, 0)) {
-      return 0;
+    if (descriptor) {
+      tor_snprintf(keydir,sizeof(keydir),"%s/router.desc",
+                   options->DataDirectory);
+      log_fn(LOG_INFO,"Saving descriptor to \"%s\"...",keydir);
+      if (write_str_to_file(keydir, descriptor, 0)) {
+        return 0;
+      }
     }
   }
   return 0;



More information about the tor-commits mailing list