ossp-pkg/var/var.c 1.35 -> 1.36
--- var.c 2001/11/20 15:36:42 1.35
+++ var.c 2001/11/20 15:46:35 1.36
@@ -893,7 +893,6 @@
if (!tokenbuf_assign(&res, p, data->end - p))
return VAR_ERR_OUT_OF_MEMORY;
} else { /* OK, then use num2. */
-
if (isrange) {
if ((p + num2) > data->end)
return VAR_ERR_RANGE_OUT_OF_BOUNDS;
@@ -904,9 +903,7 @@
return VAR_ERR_OFFSET_LOGIC;
if ((data->begin + num2) > data->end)
return VAR_ERR_RANGE_OUT_OF_BOUNDS;
- if (!tokenbuf_assign(&res, p, num2 - num1))
-//FIXME THL: I expect start-end *inclusive*
-//FIXME THL: I expect start,len len characters not len-1
+ if (!tokenbuf_assign(&res, p, num2 - num1 + 1))
return VAR_ERR_OUT_OF_MEMORY;
}
}
|
|
