[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-154-g25dc93d

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=25dc93dd575994fabdcfb558521d3287f604f081

The branch, stable-2.0 has been updated
       via  25dc93dd575994fabdcfb558521d3287f604f081 (commit)
       via  1acb290f6628a6aea9a78dea9e3e91b106d22e1b (commit)
      from  c5f6c2e47fab220fd090d911efc2a71a563b7c1d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 25dc93dd575994fabdcfb558521d3287f604f081
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jan 14 22:25:59 2012 +0100

    Avoid non-portable `tail' argument in `test-guile-snarf'.
    
    * test-suite/standalone/test-guile-snarf (strip_first_line): New
      function.
      (snarf): Use it.

commit 1acb290f6628a6aea9a78dea9e3e91b106d22e1b
Author: Ludovic Courtès <address@hidden>
Date:   Sat Jan 14 22:22:22 2012 +0100

    Fix signed/unsigned pointer mismatches.
    
    * libguile/foreign.c (scm_pointer_to_bytevector,
      scm_bytevector_to_pointer): Use pointers of the same signedness.

-----------------------------------------------------------------------

Summary of changes:
 libguile/foreign.c                     |    7 ++++---
 test-suite/standalone/test-guile-snarf |   18 +++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/libguile/foreign.c b/libguile/foreign.c
index 6c05d78..f8c268d 100644
--- a/libguile/foreign.c
+++ b/libguile/foreign.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2010, 2011  Free Software Foundation, Inc.
+/* Copyright (C) 2010, 2011, 2012  Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -269,7 +269,8 @@ SCM_DEFINE (scm_pointer_to_bytevector, 
"pointer->bytevector", 2, 2, 0,
 
   blen = scm_to_size_t (len);
 
-  ret = scm_c_take_typed_bytevector (ptr + boffset, blen, btype);
+  ret = scm_c_take_typed_bytevector ((signed char *) ptr + boffset,
+                                    blen, btype);
   register_weak_reference (ret, pointer);
   return ret;
 }
@@ -283,7 +284,7 @@ SCM_DEFINE (scm_bytevector_to_pointer, 
"bytevector->pointer", 1, 1, 0,
 #define FUNC_NAME s_scm_bytevector_to_pointer
 {
   SCM ret;
-  scm_t_int8 *ptr;
+  signed char *ptr;
   size_t boffset;
 
   SCM_VALIDATE_BYTEVECTOR (1, bv);
diff --git a/test-suite/standalone/test-guile-snarf 
b/test-suite/standalone/test-guile-snarf
index 41a9dc6..e314791 100755
--- a/test-suite/standalone/test-guile-snarf
+++ b/test-suite/standalone/test-guile-snarf
@@ -1,7 +1,23 @@
 #!/bin/sh
+
+# Test the `guile-snarf' tool.
+
+# Strip the first line, like GNU `tail -n +2' does, but in a portable
+# way (`tail' on Solaris 10 doesn't support `-n +2' for instance.)
+strip_first_line ()
+{
+    read line
+    while read line
+    do
+       echo "$line"
+    done
+}
+
 snarf ()
 {
-    echo "$1" | guile-snarf - | tail -n +2 | tr -d ' \t\n'
+    # GNU cpp emits a comment on the first line, which shows what
+    # arguments it was passed.  Strip this line.
+    echo "$1" | guile-snarf - | strip_first_line | tr -d ' \t\n'
 }
 
 snarf_test ()


hooks/post-receive
-- 
GNU Guile