Mercurial > octave

diff libinterp/octave-value/ov-java.cc @ 27932:b018f553fd85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use Octave coding conventions in libinterp/ * __ftp__.cc, __ichol__.cc, call-stack.cc, error.h, event-manager.cc, file-io.cc, gl-render.cc, graphics.cc, help.cc, input.cc, interpreter.cc, load-path.cc, load-save.cc, ls-hdf5.cc, ls-hdf5.h, mex.cc, oct-hist.cc, oct-stream.cc, sighandlers.h, stack-frame.cc, stack-frame.h, strfns.cc, syminfo.cc, sysdep.cc, text-engine.h, url-handle-manager.h, urlwrite.cc, xpow.cc, __init_fltk__.cc, __ode15__.cc, ccolamd.cc, colamd.cc, cdef-class.cc, cdef-manager.cc, cdef-manager.h, cdef-method.cc, cdef-object.cc, cdef-package.h, cdef-property.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.h, ov-java.cc, ov-typeinfo.h, bp-table.cc, jit-ir.h, jit-typeinfo.h, pt-classdef.h, pt-eval.cc, pt-eval.h, pt-idx.cc: Use Octave coding conventions in libinterp.
author Rik <rik@octave.org>
date Fri, 10 Jan 2020 17:25:12 -0800
parents bd51beb6205e
children 159b6a1eb408 d2fd4616829b
line wrap: on
line diff
--- a/libinterp/octave-value/ov-java.cc	Fri Jan 10 13:19:38 2020 -0800
+++ b/libinterp/octave-value/ov-java.cc	Fri Jan 10 17:25:12 2020 -0800
@@ -519,15 +519,17 @@
 #if defined (OCTAVE_USE_WINDOWS_API)
   std::string subdirs[] = {"bin/client", "bin/server"};
 #else
-  std::string subdirs[] = {"jre/lib/server", "jre/lib", "lib/client",
-    "lib/server", "jre/lib/amd64/client", "jre/lib/amd64/server",
-    "jre/lib/i386/client", "jre/lib/i386/server"};
+  std::string subdirs[] = {"jre/lib/server", "jre/lib",
+                           "lib/client", "lib/server",
+                           "jre/lib/amd64/client", "jre/lib/amd64/server",
+                           "jre/lib/i386/client", "jre/lib/i386/server"
+                          };
 #endif
 
   for (size_t i = 0; i < sizeof (subdirs) / sizeof (subdirs[0]); i++)
     {
       std::string candidate = java_home_path + "/" + subdirs[i]
-                            + "/" LIBJVM_FILE_NAME;
+                              + "/" LIBJVM_FILE_NAME;
       if (octave::sys::file_stat (candidate))
         return candidate;
     }
@@ -679,7 +681,7 @@
               // time?  Or is it OK for the options to be fixed here?
 
               std::string java_home_cmd = std::string (JAVA_HOME_CMD)
-                + " --failfast --version 1.6+ 2>/dev/null";
+                                          + " --failfast --version 1.6+ 2>/dev/null";
 
               octave::process_execution_result rslt
                 = octave::run_command_and_return_output (java_home_cmd);
@@ -1075,7 +1077,7 @@
 {
   jclass_ref ocls (jni_env, jni_env->FindClass ("[I"));
   jobjectArray retval = jni_env->NewObjectArray (idx.length (), ocls, nullptr);
- // Here retval has the same length as idx
+  // Here retval has the same length as idx
 
   // Fill in entries of idx into retval
   for (int i = 0; i < idx.length (); i++)
@@ -1705,7 +1707,7 @@
       // into a String[], not into a char array
 
       if (val.is_double_type ())
-        UNBOX_PRIMITIVE_ARRAY ( , , jdouble,  Double);
+        UNBOX_PRIMITIVE_ARRAY ( , , jdouble, Double);
       else if (val.islogical ())
         UNBOX_PRIMITIVE_ARRAY (bool_, bool, jboolean, Boolean);
       else if (val.isfloat ())