r1346 - in branches/1.0: . lib/libvcl

[des at projects.linpro.no]

Author: des
Date: 2007-04-19 16:51:10 +0200 (Thu, 19 Apr 2007)
New Revision: 1346

Modified:
   branches/1.0/
   branches/1.0/lib/libvcl/vcc_token.c
Log:
 r37079 at cat (orig r1303):  phk | 2007-04-01 20:18:54 +0200
 Fix char position in error messages to be [1...] instead of [0...]
 
 Fix typo in /* ... */ handling
 



Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
   - d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1302
   + d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1303

Modified: branches/1.0/lib/libvcl/vcc_token.c
===================================================================
--- branches/1.0/lib/libvcl/vcc_token.c	2007-04-19 14:51:09 UTC (rev 1345)
+++ branches/1.0/lib/libvcl/vcc_token.c	2007-04-19 14:51:10 UTC (rev 1346)
@@ -88,7 +88,7 @@
 		} else
 			pos++;
 	}
-	vsb_printf(tl->sb, "(%s Line %d Pos %d)\n", f, lin, pos);
+	vsb_printf(tl->sb, "(%s Line %d Pos %d)\n", f, lin, pos + 1);
 	x = y = 0;
 	for (p = l; p < e && *p != '\n'; p++) {
 		if (*p == '\t') {
@@ -315,7 +315,7 @@
 
 		/* Skip C-style comments */
 		if (*p == '/' && p[1] == '*') {
-			for (q += 2; q < sp->e; q++) {
+			for (q = p + 2; q < sp->e; q++) {
 				if (*q == '*' && q[1] == '/') {
 					p = q + 2;
 					break;