if skip param of dba_fetch is -1 stop do not restart search after last element

helly25 · helly25 · commit 6fd9c32346b7 · 2003-02-26T22:03:00.000Z
diff --git a/ext/dba/libinifile/inifile.c b/ext/dba/libinifile/inifile.c
@@ -261,8 +261,8 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC) {
 		/* specific instance or not same key -> restart search */
 		/* the slow way: restart and seacrch */
 		php_stream_rewind(dba->fp);
+		inifile_line_free(&dba->next);
 	}
-	inifile_line_free(&dba->next);
 	if (skip == -1) {
 		skip = 0;
 	}
@@ -273,7 +273,7 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC) {
 				/* allow faster access by updating key read into next */
 				inifile_line_free(&dba->next);
 				dba->next = ln;
-				dba->next.pos = php_stream_tell(dba->fp);;
+				dba->next.pos = php_stream_tell(dba->fp);
 				return val;
 			}
 			skip--;
@@ -285,7 +285,7 @@ val_type inifile_fetch(inifile *dba, const key_type *key, int skip TSRMLS_DC) {
 		}
 	}
 	inifile_line_free(&ln);
-	inifile_line_free(&dba->next);
+	dba->next.pos = php_stream_tell(dba->fp);
 	return ln.val;
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ val_type inifile_fetch(inifile dba, const key_type key, int skip TSRMLS_DC) {`
`261`	`261`	`/* specific instance or not same key -> restart search */`
`262`	`262`	`/* the slow way: restart and seacrch */`
`263`	`263`	`php_stream_rewind(dba->fp);`
	`264`	`+ inifile_line_free(&dba->next);`
`264`	`265`	`}`
`265`		`- inifile_line_free(&dba->next);`
`266`	`266`	`if (skip == -1) {`
`267`	`267`	`skip = 0;`
`268`	`268`	`}`
`@@ -273,7 +273,7 @@ val_type inifile_fetch(inifile dba, const key_type key, int skip TSRMLS_DC) {`
`273`	`273`	`/* allow faster access by updating key read into next */`
`274`	`274`	`inifile_line_free(&dba->next);`
`275`	`275`	`dba->next = ln;`
`276`		`- dba->next.pos = php_stream_tell(dba->fp);;`
	`276`	`+ dba->next.pos = php_stream_tell(dba->fp);`
`277`	`277`	`return val;`
`278`	`278`	`}`
`279`	`279`	`skip--;`
`@@ -285,7 +285,7 @@ val_type inifile_fetch(inifile dba, const key_type key, int skip TSRMLS_DC) {`
`285`	`285`	`}`
`286`	`286`	`}`
`287`	`287`	`inifile_line_free(&ln);`
`288`		`- inifile_line_free(&dba->next);`
	`288`	`+ dba->next.pos = php_stream_tell(dba->fp);`
`289`	`289`	`return ln.val;`
`290`	`290`	`}`
`291`	`291`	`/* }}} */`