Mercurial > jwe > octave

comparison liboctave/util/oct-base64.cc @ 21136:7cac4e7458f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: clean up code around calls to current_liboctave_error_handler. Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code. * Array-util.cc, Array.cc, CColVector.cc, CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc, DiagArray2.cc, MArray.cc, PermMatrix.cc, Sparse.cc, Sparse.h, chMatrix.cc, chNDArray.cc, dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc, dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc, fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc, fRowVector.cc, idx-vector.cc, CmplxAEPBAL.cc, CmplxCHOL.cc, CmplxGEPBAL.cc, CmplxHESS.cc, CmplxLU.cc, CmplxQR.cc, CmplxSCHUR.cc, CmplxSVD.cc, DASPK.cc, EIG.cc, LSODE.cc, Quad.cc, SparseCmplxCHOL.cc, SparseCmplxLU.cc, SparseCmplxQR.cc, SparseQR.cc, SparsedbleCHOL.cc, SparsedbleLU.cc, base-lu.cc, bsxfun-defs.cc, dbleAEPBAL.cc, dbleCHOL.cc, dbleGEPBAL.cc, dbleHESS.cc, dbleLU.cc, dbleQR.cc, dbleSCHUR.cc, dbleSVD.cc, eigs-base.cc, fCmplxAEPBAL.cc, fCmplxCHOL.cc, fCmplxLU.cc, fCmplxQR.cc, fCmplxSCHUR.cc, fEIG.cc, floatAEPBAL.cc, floatCHOL.cc, floatGEPBAL.cc, floatHESS.cc, floatLU.cc, floatQR.cc, floatSCHUR.cc, floatSVD.cc, lo-specfun.cc, oct-fftw.cc, oct-rand.cc, oct-spparms.cc, sparse-base-chol.cc, sparse-dmsolve.cc, file-ops.cc, lo-sysdep.cc, mach-info.cc, oct-env.cc, oct-syscalls.cc, cmd-edit.cc, cmd-hist.cc, data-conv.cc, lo-ieee.cc, lo-regexp.cc, oct-base64.cc, oct-shlib.cc, pathsearch.cc, singleton-cleanup.cc, sparse-util.cc, unwind-prot.cc: Remove statements after call to handler that are no longer reachable. Place input validation first and immediately call handler if necessary. Change if/error_handler/else to if/error_handler and re-indent code.
author Rik <rik@octave.org>
date Sat, 23 Jan 2016 13:52:03 -0800
parents 4197fc428c7d
children f7121e111991
comparison
equal deleted inserted replaced
21135:95da3bc8a281 21136:7cac4e7458f2
66 bool ok = base64_decode_alloc (inc, str.length (), &out, &outlen); 66 bool ok = base64_decode_alloc (inc, str.length (), &out, &outlen);
67 67
68 if (! ok) 68 if (! ok)
69 (*current_liboctave_error_handler) 69 (*current_liboctave_error_handler)
70 ("base64_decode: input was not valid base64"); 70 ("base64_decode: input was not valid base64");
71 else if (! out) 71 if (! out)
72 (*current_liboctave_error_handler) 72 (*current_liboctave_error_handler)
73 ("base64_decode: memory allocation error"); 73 ("base64_decode: memory allocation error");
74
75 if ((outlen % (sizeof (double) / sizeof (char))) != 0)
76 {
77 ::free (out);
78 (*current_liboctave_error_handler)
79 ("base64_decode: incorrect input size");
80 }
74 else 81 else
75 { 82 {
76 if ((outlen % (sizeof (double) / sizeof (char))) != 0) 83 octave_idx_type len = (outlen * sizeof (char)) / sizeof (double);
77 { 84 retval.resize (dim_vector (1, len));
78 ::free (out); 85 double *dout = reinterpret_cast<double*> (out);
79 (*current_liboctave_error_handler) 86 std::copy (dout, dout + len, retval.fortran_vec ());
80 ("base64_decode: incorrect input size"); 87 ::free (out);
81 }
82 else
83 {
84 octave_idx_type len = (outlen * sizeof (char)) / sizeof (double);
85 retval.resize (dim_vector (1, len));
86 double *dout = reinterpret_cast<double*> (out);
87 std::copy (dout, dout + len, retval.fortran_vec ());
88 ::free (out);
89 }
90 } 88 }
91 89
92 return retval; 90 return retval;
93 } 91 }
94 92