formatting fixes

diff --git a/src/W1Device.cc b/src/W1Device.cc
index 3160c81034e6e502b8526a5890c00226d5ebf2e7..7f52c43f5795341c5943eb8610c5fd71f43d96a4 100644 (file)
--- a/src/W1Device.cc
+++ b/src/W1Device.cc
@@ -14,7 +14,9 @@
 using namespace w1;
 using namespace std;
 
 using namespace w1;
 using namespace std;
 

-W1Device::W1Device(dirent *direntry, int family_code_param, string id_param) {
+W1Device::W1Device(dirent *direntry,
+               int family_code_param,
+               string id_param) {

        string rootdir;
        string device_dir;
        string temp_str;
        string rootdir;
        string device_dir;
        string temp_str;


@@ -24,7 +26,7 @@ W1Device::W1Device(dirent *direntry, int family_code_param, string id_param) {
        dir_path        = rootdir + "/" + direntry->d_name;
        slave_file      = dir_path + "/" + temp_str;
        family_code     = family_code_param;
        dir_path        = rootdir + "/" + direntry->d_name;
        slave_file      = dir_path + "/" + temp_str;
        family_code     = family_code_param;

-       id                      = id_param;
+       id              = id_param;

        name            = id_param;
 }
 
        name            = id_param;
 }
 

diff --git a/src/W1Scanner.cc b/src/W1Scanner.cc
index 08f96cc10ee765c34b841cc7249d8efa100d3a63..6a55eeb9c87ccab421928ef928fe36a18dcabf7f 100644 (file)
--- a/src/W1Scanner.cc
+++ b/src/W1Scanner.cc
@@ -78,13 +78,13 @@ W1Device *W1Scanner::create_device(dirent *direntry) {
 }
 
 list<W1Device *> W1Scanner::get_device_list() {
 }
 
 list<W1Device *> W1Scanner::get_device_list() {

-       DIR                             *dir;
-       int                                     err_flg;
+       DIR                     *dir;
+       int                     err_flg;

        struct dirent           *direntry;
        struct dirent           *direntry;

-       W1Device                        *device;
-    list<W1Device *>   ret_val;
+       W1Device                *device;
+       list<W1Device *>        ret_val;

 
 

-       dir             = opendir(W1_SCAN_ROOTDIR);
+       dir     = opendir(W1_SCAN_ROOTDIR);

        if (dir != NULL) {
                direntry        = readdir(dir);
                while(direntry != NULL) {
        if (dir != NULL) {
                direntry        = readdir(dir);
                while(direntry != NULL) {

diff --git a/src/W1TemperatureSensor.cc b/src/W1TemperatureSensor.cc
index 20dc3f388b9fb228736f9143c3d9188dc3b6b150..39977e528cc75d97ef0c1ce6b7a2162adb79c34b 100644 (file)
--- a/src/W1TemperatureSensor.cc
+++ b/src/W1TemperatureSensor.cc
@@ -75,13 +75,13 @@ bool W1TemperatureSensor::is_supported_family_code(int family_code) {
 
 string W1TemperatureSensor::get_value() {
        vector<string>  text_file;
 
 string W1TemperatureSensor::get_value() {
        vector<string>  text_file;

-       string                  temp;
-       string                  ret_val;
-       string                  last_line;
-       int                             pos;
-       int                             length;
-       string                  formatted_data;
-       int                             int_value;
+       string          temp;
+       string          ret_val;
+       string          last_line;
+       int             pos;
+       int             length;
+       string          formatted_data;
+       int             int_value;

 
        ret_val = "<could not read>";
        ifstream ifs(slave_file.c_str());
 
        ret_val = "<could not read>";
        ifstream ifs(slave_file.c_str());