X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src_test%2Ftest_w1.cc;h=5b5e6eb8d80d2dbe135a52eadc11e4758a4c29d0;hb=64f4c95cf6d3a772bfc721081dc39e2105c2756c;hp=6aa372fb3e05e2f9e2bfe7303d22ac3428408ba7;hpb=87afaf6ff028091d7de11f577bc1f24f1bd0d3e3;p=lib1wire.git

diff --git a/src_test/test_w1.cc b/src_test/test_w1.cc
index 6aa372f..5b5e6eb 100644
--- a/src_test/test_w1.cc
+++ b/src_test/test_w1.cc
@@ -44,7 +44,7 @@ bool try_parse_long(const char *str, long *result) {
 
 int main(int argc, char** argv) {
 	W1Scanner 		*scanner;
-	list<W1Device *>	device_list;
+ 	list<W1Device *>	device_list;
 	int			round;
 	long			scan_interval;
 	long			store_interval;
@@ -52,27 +52,27 @@ int main(int argc, char** argv) {
 	bool			err_flg;
 
 	// default values than can be overwritten with parameters
-	location		= "/tmp/";
+	location	= "/tmp/";
 	scan_interval	= 600;
-	store_interval		= 6;
+	store_interval	= 6;
 	if (argc > 1) {
 		location	= argv[1];
 		log_info("storage location: %s\n", location.c_str());
 	}
 	else {
-		log_warning("storage location was not given as a parameter, using default location: %s\n", location.c_str());
+		log_warning("No storage location parameter given, using default location: %s\n", location.c_str());
 	}
 	if (argc > 2) {
 		try_parse_long(argv[2], &scan_interval);
 	}
 	if (argc > 3) {
-			try_parse_long(argv[3], &store_interval);
+		try_parse_long(argv[3], &store_interval);
 	}
 	log_info("start scanning, data saved to location: %s, scan interval: %d, store interval: %d\n", location.c_str(), scan_interval, store_interval);
-	W1Store::set_location(location.c_str());
-	scanner			= new W1Scanner();
-	device_list		= scanner->get_device_list();
-	round			= 0;
+	W1Store::set_location_base_dir(location.c_str());
+	scanner		= new W1Scanner();
+	device_list	= scanner->get_device_list();
+	round		= 0;
 	if (device_list.size() > 0) {
 		while(1) {
 			round++;