# HG changeset patch # User Rik # Date 1630357278 25200 # Node ID 4ba71a1b632d9cb615ebc49cc2abfff844998973 # Parent 46001ac1b6b15afc777e653d7249acccfb4501d0 maint: use "m_" prefix for member variables in class uname. * oct-uname.cc, oct-uname.h: Use "m_" prefix for member variables in class uname. diff -r 46001ac1b6b1 -r 4ba71a1b632d liboctave/system/oct-uname.cc --- a/liboctave/system/oct-uname.cc Mon Aug 30 13:57:47 2021 -0700 +++ b/liboctave/system/oct-uname.cc Mon Aug 30 14:01:18 2021 -0700 @@ -42,11 +42,11 @@ { char *sysname, *nodename, *release, *version, *machine; - err = octave_uname_wrapper (&sysname, &nodename, &release, - &version, &machine); + m_err = octave_uname_wrapper (&sysname, &nodename, &release, + &version, &machine); - if (err < 0) - msg = std::strerror (errno); + if (m_err < 0) + m_msg = std::strerror (errno); else { m_sysname = sysname; @@ -54,7 +54,7 @@ m_release = release; m_version = version; m_machine = machine; - msg = ""; + m_msg = ""; } } } diff -r 46001ac1b6b1 -r 4ba71a1b632d liboctave/system/oct-uname.h --- a/liboctave/system/oct-uname.h Mon Aug 30 13:57:47 2021 -0700 +++ b/liboctave/system/oct-uname.h Mon Aug 30 14:01:18 2021 -0700 @@ -44,13 +44,13 @@ : m_sysname ("unknown"), m_nodename ("unknown"), m_release ("unknown"), m_version ("unknown"), m_machine ("unknown"), - msg ("uname not supported on this system"), err (-1) + m_msg ("uname not supported on this system"), m_err (-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), msg (unm.msg), err (unm.err) + m_machine (unm.m_machine), m_msg (unm.m_msg), m_err (unm.m_err) { } uname& operator = (const uname& unm) @@ -63,8 +63,8 @@ m_version = unm.m_version; m_machine = unm.m_machine; - msg = unm.msg; - err = unm.err; + m_msg = unm.m_msg; + m_err = unm.m_err; } return *this; @@ -78,8 +78,8 @@ std::string version (void) const { return m_version; } std::string machine (void) const { return m_machine; } - std::string message (void) const { return msg; } - int error (void) const { return err; } + std::string message (void) const { return m_msg; } + int error (void) const { return m_err; } private: @@ -89,8 +89,8 @@ std::string m_version; std::string m_machine; - std::string msg; - int err; + std::string m_msg; + int m_err; void init (void); };