Mercurial > octave

changeset 30089:b0d67d613853

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: rename private member variables in class uname for clarity. * oct-uname.cc, oct-uname.h: Rename "m_msg" to "m_errmsg" and "m_err" to "m_errno" in class uname.
author Rik <rik@octave.org>
date Mon, 30 Aug 2021 21:43:20 -0700
parents fca57eaad2d4
children 1575b324613d
files liboctave/system/oct-uname.cc liboctave/system/oct-uname.h
diffstat 2 files changed, 14 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/system/oct-uname.cc	Mon Aug 30 21:31:51 2021 -0700
+++ b/liboctave/system/oct-uname.cc	Mon Aug 30 21:43:20 2021 -0700
@@ -42,11 +42,11 @@
     {
       char *sysname, *nodename, *release, *version, *machine;
 
-      m_err = octave_uname_wrapper (&sysname, &nodename, &release,
-                                    &version, &machine);
+      m_errno = octave_uname_wrapper (&sysname, &nodename, &release,
+                                      &version, &machine);
 
-      if (m_err < 0)
-        m_msg = std::strerror (errno);
+      if (m_errno < 0)
+        m_errmsg = std::strerror (errno);
       else
         {
           m_sysname = sysname;
@@ -54,7 +54,7 @@
           m_release = release;
           m_version = version;
           m_machine = machine;
-          m_msg = "";
+          m_errmsg = "";
         }
     }
   }
--- a/liboctave/system/oct-uname.h	Mon Aug 30 21:31:51 2021 -0700
+++ b/liboctave/system/oct-uname.h	Mon Aug 30 21:43:20 2021 -0700
@@ -44,13 +44,14 @@
         : m_sysname ("unknown"), m_nodename ("unknown"),
           m_release ("unknown"), m_version ("unknown"),
           m_machine ("unknown"),
-          m_msg ("uname not supported on this system"), m_err (-1)
+          m_errmsg ("uname not supported on this system"), m_errno (-1)
       { init (); }
 
       uname (const uname& unm)
         : m_sysname (unm.m_sysname), m_nodename (unm.m_nodename),
           m_release (unm.m_release), m_version (unm.m_version),
-          m_machine (unm.m_machine), m_msg (unm.m_msg), m_err (unm.m_err)
+          m_machine (unm.m_machine),
+          m_errmsg (unm.m_errmsg), m_errno (unm.m_errno)
       { }
 
       uname& operator = (const uname& unm)
@@ -63,8 +64,8 @@
             m_version = unm.m_version;
             m_machine = unm.m_machine;
 
-            m_msg = unm.m_msg;
-            m_err = unm.m_err;
+            m_errmsg = unm.m_errmsg;
+            m_errno = unm.m_errno;
           }
 
         return *this;
@@ -78,8 +79,8 @@
       std::string version (void) const { return m_version; }
       std::string machine (void) const { return m_machine; }
 
-      std::string message (void) const { return m_msg; }
-      int error (void) const { return m_err; }
+      std::string message (void) const { return m_errmsg; }
+      int error (void) const { return m_errno; }
 
     private:
 
@@ -89,8 +90,8 @@
       std::string m_version;
       std::string m_machine;
 
-      std::string m_msg;
-      int m_err;
+      std::string m_errmsg;
+      int m_errno;
 
       void init (void);
     };