diff libinterp/dldfcn/__glpk__.cc @ 20939:b17fda023ca6

maint: Use new C++ archetype in more files. Place input validation first in files. Move declaration of retval down in function to be closer to point of usage. Eliminate else clause after if () error. Use "return ovl()" where it makes sense. * find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc, load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc: Use new C++ archetype in more files.
author Rik <rik@octave.org>
date Fri, 18 Dec 2015 15:37:22 -0800
parents baa3b9f0e9d4
children 48b2ad5ee801
line wrap: on
line diff
--- a/libinterp/dldfcn/__glpk__.cc	Fri Dec 18 16:22:53 2015 -0500
+++ b/libinterp/dldfcn/__glpk__.cc	Fri Dec 18 15:37:22 2015 -0800
@@ -335,16 +335,13 @@
 Undocumented internal function.\n\
 @end deftypefn")
 {
-  octave_value_list retval;
-
 #if defined (HAVE_GLPK)
 
   // FIXME: Should we even need checking for an internal function?
   if (args.length () != 9)
     print_usage ();
 
-  //-- 1nd Input. A column array containing the objective function
-  //--            coefficients.
+  // 1nd Input.  A column array containing the objective function coefficients.
   volatile int mrowsc = args(0).rows ();
 
   Matrix C = args(0).xmatrix_value ("__glpk__: invalid value of C");
@@ -356,7 +353,7 @@
   volatile int mrowsA;
   volatile int nz = 0;
 
-  //-- 2nd Input. A matrix containing the constraints coefficients.
+  // 2nd Input.  A matrix containing the constraints coefficients.
   // If matrix A is NOT a sparse matrix
   if (args(1).is_sparse_type ())
     {
@@ -629,15 +626,13 @@
   extra.assign ("time", time);
   extra.assign ("status", status);
 
-  retval = ovl (xmin, fmin, errnum, extra);
+  return ovl (xmin, fmin, errnum, extra);
 
 #else
 
   gripe_not_supported ("glpk");
 
 #endif
-
-  return retval;
 }
 
 /*