[Guile-commits] 01/27: Require vector as argument to vector-copy

[Daniel Llorens]

lloda pushed a commit to branch wip-vector-cleanup
in repository guile.

commit 1c33cccdc15299dd2a244326684158079759b690
Author: Daniel Llorens <address@hidden>
AuthorDate: Mon Feb 3 11:21:20 2020 +0100

    Require vector as argument to vector-copy
    
    * libguile/vectors.c: Require vector and simplify.
---
 libguile/vectors.c | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/libguile/vectors.c b/libguile/vectors.c
index 1578841..e88354b 100644
--- a/libguile/vectors.c
+++ b/libguile/vectors.c
@@ -33,6 +33,7 @@
 #include "numbers.h"
 #include "pairs.h"
 #include "vectors.h"
+#include <string.h>
 
 #include "generalized-vectors.h"
 
@@ -265,22 +266,11 @@ SCM_DEFINE (scm_vector_copy, "vector-copy", 1, 0, 0,
            "Return a copy of @var{vec}.")
 #define FUNC_NAME s_scm_vector_copy
 {
-  scm_t_array_handle handle;
-  size_t i, len;
-  ssize_t inc;
-  const SCM *src;
-  SCM result, *dst;
-
-  src = scm_vector_elements (vec, &handle, &len, &inc);
-
-  result = scm_c_make_vector (len, SCM_UNDEFINED);
-  dst = SCM_I_VECTOR_WELTS (result);
-  for (i = 0; i < len; i++, src += inc)
-    dst[i] = *src;
-
-  scm_array_handle_release (&handle);
-
-  return result;
+  SCM_VALIDATE_VECTOR(1, vec);
+  size_t len = SCM_I_VECTOR_LENGTH (vec);
+  SCM val = scm_c_make_vector (len, SCM_UNDEFINED);
+  memcpy (SCM_I_VECTOR_WELTS (val), SCM_I_VECTOR_ELTS (vec), len * 
sizeof(SCM));
+  return val;
 }
 #undef FUNC_NAME