[or-cvs] r13253: more cleanup on r13250: no need to log in both places (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-01-24 00:15:50 -0500 (Thu, 24 Jan 2008)
New Revision: 13253

Modified:
   tor/trunk/src/or/rendclient.c
Log:
more cleanup on r13250: no need to log in both places


Modified: tor/trunk/src/or/rendclient.c
===================================================================
--- tor/trunk/src/or/rendclient.c	2008-01-24 05:00:28 UTC (rev 13252)
+++ tor/trunk/src/or/rendclient.c	2008-01-24 05:15:50 UTC (rev 13253)
@@ -323,23 +323,8 @@
                         "descriptor ID did not succeed.");
       return;
     }
-    switch (directory_get_from_hs_dir(descriptor_id, query)) {
-    case -1:
-      /* Whatever error this was, it was already logged. */
-      log_info(LD_REND, "Error while trying to fetch descriptor from "
-                        "hidden service directory!");
-      return;
-    case 0:
-      /* Try the next replica, if available. */
-      log_info(LD_REND, "No hidden service directory left for this replica; "
-                        "trying another.");
-      continue;
-    case 1:
-      /* Request was sent, we are done here. */
-      log_info(LD_REND, "Request to fetch descriptor from hidden service "
-                        "directory sent; waiting for response.");
-      return;
-    }
+    if (directory_get_from_hs_dir(descriptor_id, query) != 0)
+      return; /* either success or failure, but we're done */
   }
   /* If we come here, there are no hidden service directories left. */
   log_info(LD_REND, "Could not pick one of the responsible hidden "