[or-cvs] r9186: Fix 2 bugs in last patch. (VS has weird ideas about const, a (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-12-24 01:50:57 -0500 (Sun, 24 Dec 2006)
New Revision: 9186

Modified:
   tor/trunk/
   tor/trunk/src/or/main.c
Log:
 r11706@Kushana:  nickm | 2006-12-24 01:50:52 -0500
 Fix 2 bugs in last patch.  (VS has weird ideas about const, and I have weird ideas about block structure.)



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11706] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2006-12-24 06:32:24 UTC (rev 9185)
+++ tor/trunk/src/or/main.c	2006-12-24 06:50:57 UTC (rev 9186)
@@ -2048,15 +2048,16 @@
   for (i = 1; i < backup_argc; ++i) {
     if (!strcmp(backup_argv[i], "--options") ||
         !strcmp(backup_argv[i], "-options")) {
-      while (++i < backup_argc)
+      while (++i < backup_argc) {
         if (!strcmp(backup_argv[i], "-f"))
           use_default_torrc = 0;
         smartlist_add(sl, backup_argv[i]);
+      }
     }
   }
   if (use_default_torrc) {
     smartlist_add(sl, "-f");
-    smartlist_add(sl, torrc);
+    smartlist_add(sl, (char*)torrc);
   }
   tor_assert(smartlist_len(sl));
   options = smartlist_join_strings(sl,"\" \"",0,NULL);