Fixed link_errno warnings

Author: tyler-gilbert

include/api/SObject.hpp

@@ -50,16 +50,13 @@ class SObject {
 
     /*! \details Clears the current error.
      */
-    void clear_error() const { m_error_number = ERROR_NONE; }
+    void clear_error_number() const { m_error_number = ERROR_NONE; }
 
 protected:
 
+    //These methods are used internally to assign the error_number() value
     int set_error_number_if_error(int ret) const;
-
-    /*! \details Sets the error number.
-     *
-     * @param value The value to assign to the error number.
-     */
+    void set_error_number_to_errno() const;
     void set_error_number(int value) const { m_error_number = value; }
 
 private:

src/api/SObject.cpp

@@ -30,3 +30,12 @@ int SObject::set_error_number_if_error(int ret) const {
     }
     return ret;
 }
+
+void SObject::set_error_number_to_errno() const {
+#if defined __link
+        set_error_number(link_errno);
+#else
+        set_error_number(errno);
+#endif
+}
+

src/sys/Dir.cpp

@@ -9,7 +9,6 @@ using namespace sys;
 
 
 #if defined __link
-#define errno link_errno
 Dir::Dir(link_transport_mdriver_t * driver){
 	m_dirp = 0;
 	m_driver = driver;
@@ -66,7 +65,7 @@ int Dir::open(const char * name){
 	m_dirp = opendir(name);
 #endif
 	if( m_dirp == 0 ){
-        set_error_number(errno);
+        set_error_number_to_errno();
 		return -1;
 	}
 
@@ -121,8 +120,8 @@ const char * Dir::read(){
 #else
 	struct dirent * result;
 	if( readdir_r(m_dirp, &m_entry, &result) < 0 ){
-        set_error_number(errno);
-		return 0;
+        set_error_number_to_errno();
+        return 0;
 	}
 #endif
 	return m_entry.d_name;
@@ -148,7 +147,7 @@ int Dir::close(){
 		link_closedir(driver(), m_dirp);
 #else
         if( closedir(m_dirp) < 0 ){
-            set_error_number(errno);
+            set_error_number_to_errno();
         }
 #endif
 		m_dirp = 0;

src/sys/File.cpp

@@ -8,7 +8,6 @@
 using namespace sys;
 
 #if defined __link
-#define errno link_errno
 File::File(link_transport_mdriver_t * d){
     // TODO Auto-generated constructor stub
     m_fd = -1; //The file is not open
@@ -165,7 +164,7 @@ int File::close(){
 #endif
         m_fd = -1;
         if( ret < 0 ){
-            set_error_number(errno);
+            set_error_number_to_errno();
         }
     }
     return ret;

src/sys/FileInfo.cpp

@@ -7,7 +7,6 @@
 namespace sys {
 
 #if defined __link
-#define errno link_errno
 FileInfo::FileInfo(link_transport_mdriver_t * d){
 	m_driver = d;
 	memset(&m_stat, 0, sizeof(m_stat));
@@ -26,11 +25,8 @@ int FileInfo::get_info(const char * path){
 #else
     ret = File::stat(path, &m_stat);
 #endif
-    if( ret < 0 ){
-        set_error_number(errno);
-    }
 
-    return ret;
+    return set_error_number_if_error(ret);
 }