Mercurial > octave

changeset 30298:5797b9f87086

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
base64-wrappers: Fix types after gnulib update. * liboctave/wrappers/base64-wrappers.c, liboctave/wrappers/base64-wrappers.h (octave_base64_encode_alloc_wrapper, octave_base64_decode_alloc_wrapper), liboctave/util/oct-base64.cc (base64_encode, base64_decode, base64_decode_bytes): gnulib changed types in function prototypes from size_t to ptrdiff_t. Follow suit.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 18 Nov 2021 17:45:49 +0100
parents 5ea881d55465
children f306fe9bfa0d
files liboctave/util/oct-base64.cc liboctave/wrappers/base64-wrappers.c liboctave/wrappers/base64-wrappers.h
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/oct-base64.cc	Thu Nov 18 17:04:22 2021 +0100
+++ b/liboctave/util/oct-base64.cc	Thu Nov 18 17:45:49 2021 +0100
@@ -40,7 +40,7 @@
   {
     bool ret = false;
 
-    std::size_t outlen = octave_base64_encode_alloc_wrapper (inc, inlen, out);
+    std::ptrdiff_t outlen = octave_base64_encode_alloc_wrapper (inc, inlen, out);
 
     if (! out)
       {
@@ -63,7 +63,7 @@
     Array<double> retval;
 
     double *out;
-    std::size_t outlen;
+    std::ptrdiff_t outlen;
 
     bool ok
       = octave_base64_decode_alloc_wrapper (str.data (), str.length (),
@@ -101,7 +101,7 @@
     intNDArray<octave_uint8> retval;
 
     char *out;
-    std::size_t outlen;
+    std::ptrdiff_t outlen;
 
     bool ok
       = octave_base64_decode_alloc_wrapper (str.data (), str.length (),
--- a/liboctave/wrappers/base64-wrappers.c	Thu Nov 18 17:04:22 2021 +0100
+++ b/liboctave/wrappers/base64-wrappers.c	Thu Nov 18 17:45:49 2021 +0100
@@ -36,15 +36,15 @@
 
 #include "base64-wrappers.h"
 
-size_t
-octave_base64_encode_alloc_wrapper (const char *in, size_t inlen, char **out)
+ptrdiff_t
+octave_base64_encode_alloc_wrapper (const char *in, ptrdiff_t inlen, char **out)
 {
   return base64_encode_alloc (in, inlen, out);
 }
 
 bool
-octave_base64_decode_alloc_wrapper (const char *in, size_t inlen,
-                                    char **out, size_t *outlen)
+octave_base64_decode_alloc_wrapper (const char *in, ptrdiff_t inlen,
+                                    char **out, ptrdiff_t *outlen)
 {
   return base64_decode_alloc (in, inlen, out, outlen);
 }
--- a/liboctave/wrappers/base64-wrappers.h	Thu Nov 18 17:04:22 2021 +0100
+++ b/liboctave/wrappers/base64-wrappers.h	Thu Nov 18 17:45:49 2021 +0100
@@ -37,12 +37,12 @@
 extern "C" {
 #endif
 
-extern OCTAVE_API size_t
-octave_base64_encode_alloc_wrapper (const char *in, size_t inlen, char **out);
+extern OCTAVE_API ptrdiff_t
+octave_base64_encode_alloc_wrapper (const char *in, ptrdiff_t inlen, char **out);
 
 extern OCTAVE_API bool
-octave_base64_decode_alloc_wrapper (const char *in, size_t inlen,
-                                    char **out, size_t *outlen);
+octave_base64_decode_alloc_wrapper (const char *in, ptrdiff_t inlen,
+                                    char **out, ptrdiff_t *outlen);
 
 #if defined __cplusplus
 }