[or-cvs] r10787: tweaks to last patch. from croup. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-07-10 17:46:33 -0400 (Tue, 10 Jul 2007)
New Revision: 10787

Modified:
   tor/trunk/
   tor/trunk/src/or/routerparse.c
Log:
 r13689 at catbus:  nickm | 2007-07-10 17:46:30 -0400
 tweaks to last patch.  from croup.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r13689] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/routerparse.c
===================================================================
--- tor/trunk/src/or/routerparse.c	2007-07-10 20:08:18 UTC (rev 10786)
+++ tor/trunk/src/or/routerparse.c	2007-07-10 21:46:33 UTC (rev 10787)
@@ -2365,7 +2365,7 @@
   tok->tp = _ERR;
 
   *s = eat_whitespace_eos(*s, eos);
-  if (!**s) {
+  if (*s == eos) {
     tok->tp = _EOF;
     return tok;
   }
@@ -2377,10 +2377,8 @@
   if (!strncmp("opt", *s, next-*s)) {
     /* Skip past an "opt" at the start of the line. */
     *s = eat_whitespace_eos(next, eos);
-    next = NULL;
-    if (**s)
-      next = find_whitespace_eos(*s, eos);
-    if (!**s || !next) {
+    next = find_whitespace_eos(*s, eos);
+    if (!next) {
       RET_ERR("opt without keyword");
     }
   }