X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FW1Util.cc;h=452d7290758e7b1eee203e5d27e39c9a03a548a0;hb=6b8da0110c1dc3c720b6000b95b401b87e78d3f2;hp=c5773bc781f2cdb805c770ace2d1e9389b2a32ce;hpb=c4b6d88d7ea02f5ae9b68a075944ff381a2f22c5;p=lib1wire.git

diff --git a/src/W1Util.cc b/src/W1Util.cc
index c5773bc..452d729 100644
--- a/src/W1Util.cc
+++ b/src/W1Util.cc
@@ -63,7 +63,7 @@ char *W1Util::parse_directory_path(const char *file_path) {
 	return ret_val;
 }
 
-bool W1Util::mkdirs(char *path) {
+bool W1Util::mkdirs(const char *path) {
 	bool	ret_val;
 	char	*p;
 	int	err_flg;
@@ -71,13 +71,13 @@ bool W1Util::mkdirs(char *path) {
 	ret_val	= true;
 	if (path != NULL) {
 		// go through each directory one by and and create if not exist
-		for (p = path; *p; p++) {
+		for (p = (char *)path; *p; p++) {
 		    if ((p != path) &&
 			((*p == '/') ||
 			 (*p == '\\'))) {
 				*p = '\0';
-				// test whether directory exist and is writable
-				if (access(path, F_OK)) {
+				// if dir does not exist, create it
+				if (access(path, F_OK) != 0) {
 					log_debug("trying to create directory: %s\n", path);
 					err_flg	= mkdir(path, S_IRWXU);
 					if (err_flg != 0) {
@@ -89,8 +89,8 @@ bool W1Util::mkdirs(char *path) {
 			}
 		}
 		if (ret_val == true) {
-			// test also the existense of whole directory
-			if (access(path, F_OK))	{
+			// if dir does not exist, create it
+			if (access(path, F_OK) != 0) {
 				log_debug("trying to create directory: %s\n", path);
 				err_flg	= mkdir(path, S_IRWXU);
 				if (err_flg != 0) {
@@ -108,9 +108,7 @@ bool W1Util::mkdirs(char *path) {
 
 std::ofstream *W1Util::open_for_writing(const char *f_path) {
 	char 		*d_path;
-	char		*p;
 	size_t		b_count;
-	int		ii;
 	ofstream	*ret_val;
 	bool		b_flg;
 
@@ -296,34 +294,3 @@ Date W1Util::parse_date_str(string date_str) {
 	ss >>ret_val.year >>c >>ret_val.month >>c >>ret_val.day >>ret_val.hour >>c >>ret_val.min >>c >>ret_val.sec;
 	return ret_val;
 }
-
-Data *W1Util::parse_data_line(const string& dataline) {
-	stringstream	ss(dataline);
-	string		item;
-	double		val;
-	Data		*ret_val;
-	int		ii;
-	bool		suc_flg;
-	vector<double>	v;
-	Date		date;
-
-	ii	= 0;
-	while(getline(ss, item, '|')) {
-		if (ii == 0) {
-			// parse date
-			date	= parse_date_str(item);
-		}
-		// skip the device type and device id fields
-		// TODO: store device type and id to own file
-		else if (ii >= 3) {
-			suc_flg	= string_to_number<double>(val, item, dec);
-			if (suc_flg) {
-				//log_debug("adding number: %f\n", val);
-				v.push_back(val);
-			}
-		}
-		ii++;
-	}
-	ret_val	= new Data(v, &date);
-	return ret_val;
-}