[Guile-commits] GNU Guile branch, master, updated. release_1-9-6-76-gd8164b0

[Julian Graham]

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=d8164b046c71c3f313fa4f7e239d50823b619297

The branch, master has been updated
       via  d8164b046c71c3f313fa4f7e239d50823b619297 (commit)
      from  9c246c03838c1cc844d15a7c4817029df1994e96 (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 d8164b046c71c3f313fa4f7e239d50823b619297
Author: Julian Graham <address@hidden>
Date:   Wed Jan 6 23:01:05 2010 -0500

    Attempt to narrow normalized strings.
    
    * libguile/strings.c (normalize_str): Clean up indentation.  Add call to
      scm_i_try_narrow_string.

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

Summary of changes:
 libguile/strings.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/libguile/strings.c b/libguile/strings.c
index 0cbab3e..d3bb325 100644
--- a/libguile/strings.c
+++ b/libguile/strings.c
@@ -1760,12 +1760,17 @@ normalize_str (SCM string, uninorm_t form)
        w_str[i] = (unsigned char) buf[i];
       w_str[len] = 0;
     }
-  else w_str = (scm_t_uint32 *) scm_i_string_wide_chars (string);
+  else 
+    w_str = (scm_t_uint32 *) scm_i_string_wide_chars (string);
+
   w_str = u32_normalize (form, w_str, len, NULL, &rlen);  
   
   ret = scm_i_make_wide_string (rlen, &cbuf);
   u32_cpy ((scm_t_uint32 *) cbuf, w_str, rlen);
   free (w_str);
+
+  scm_i_try_narrow_string (ret);
+
   return ret;
 }
 


hooks/post-receive
-- 
GNU Guile