Mercurial > octave

changeset 25676:a6af9578c18a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author John W. Eaton <jwe@octave.org>
date Thu, 26 Jul 2018 11:10:18 -0400
parents 20aa564402c4 (current diff) 1ba60c0455f4 (diff)
children 5401dfadd2f6
files
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/system/oct-uname.cc	Thu Jul 26 09:41:30 2018 -0400
+++ b/liboctave/system/oct-uname.cc	Thu Jul 26 11:10:18 2018 -0400
@@ -42,7 +42,7 @@
       err = octave_uname_wrapper (&sysname, &nodename, &release,
                                   &version, &machine);
 
-      if (err)
+      if (err < 0)
         msg = std::strerror (errno);
       else
         {
--- a/liboctave/wrappers/uname-wrapper.c	Thu Jul 26 09:41:30 2018 -0400
+++ b/liboctave/wrappers/uname-wrapper.c	Thu Jul 26 11:10:18 2018 -0400
@@ -42,7 +42,15 @@
 
   int err = uname (&unm);
 
-  if (err == 0)
+  if (err < 0)
+    {
+      *sysname = 0;
+      *nodename = 0;
+      *release = 0;
+      *version = 0;
+      *machine = 0;
+    }
+  else
     {
       *sysname = unm.sysname;
       *nodename = unm.nodename;
@@ -50,14 +58,6 @@
       *version = unm.version;
       *machine = unm.machine;
     }
-  else
-    {
-      *sysname = 0;
-      *nodename = 0;
-      *release = 0;
-      *version = 0;
-      *machine = 0;
-    }
 
   return err;
 }