Re: Merge the "charset" branch?

[John Darrington]

All those changes look good to me.  Merge it into charset when you're
ready.

J'

On Tue, Apr 07, 2009 at 09:33:59PM -0700, Ben Pfaff wrote:
     John Darrington <address@hidden> writes:
     
     > I think the charset branch is now at the stage where it works no worse
     > than the master branch.
     
     I looked through the commits there.  They look good.
     
     One comment: Commit 99e37c4d062a "Issue warning when combining
     files of distinct encodings" adds a comment that ends without
     completing its thought.
     
     I also have a number of additional commits to propose with minor
     fixes and improvements.  I pushed these to a branch
     "charset-additions" that starts from charset.  Here is the
     summary of those changes:
     
     commit e93305aff3e79fd7b810d180cb71c080ad6d5b96
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 21:26:50 2009 -0700
     
         Fix memory leak in cmd_data_list().
     
      src/language/data-io/data-list.c |    2 ++
      1 files changed, 2 insertions(+), 0 deletions(-)
     
     commit e0e0fab736b71dd934d82bcc91a5ba674d3491d5
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 21:24:43 2009 -0700
     
         Fix a few typos and capitalization errors in developers guide.
     
      doc/dev/i18n.texi |   12 ++++++------
      1 files changed, 6 insertions(+), 6 deletions(-)
     
     commit f1b01009a4d6468f4688a4786752edfcd7899d04
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 21:20:47 2009 -0700
     
         SET LOCALE: Don't use lex_tokstr() after skipping to next token.
         
         The return value from lex_tokstr() is only valid until the next call to
         lex_get() (or another function that changes the current token), so 
don't
         advance past the token until we're done with its string value.
     
      src/language/utilities/set.q |    6 +++---
      1 files changed, 3 insertions(+), 3 deletions(-)
     
     commit dd2e61b4a4e0f5605588a9d7249ea5d9bd70287a
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 21:15:40 2009 -0700
     
         Make create_iconv() properly distinguish converters by name.
         
         The code in create_iconv() assumed that every pair of different 
converters
         had a different hash value.  This is a bad assumption: eventually, we 
will
         be unlucky, and two different converters will hash to the same value, 
and
         we will get a bad conversion.  So we have to compare (and store) the
         names of the codes that each converters converts to and from.
         
         Also, compute the hash value without making an extra copy of fromcode
         and tocode.
     
      src/libpspp/i18n.c |   63 
+++++++++++++++++++++++++--------------------------
      1 files changed, 31 insertions(+), 32 deletions(-)
     
     commit 8ef8acb7c70a321963d30f2264e8f91e16427fcf
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 21:02:14 2009 -0700
     
         Add "x" prefix to calls to plain malloc(), calloc(), strdup(), 
realloc().
         
         In review commit 503f53bfdde "Read dictionary encoding from data files"
         I noticed uses of plain strdup() (not xstrdup()).  Some greps showed 
that
         there were several other uses of strdup(), as well as calloc(), 
malloc(),
         and realloc(), in the source tree.  This commit adds "x" prefixes to 
each
         of them, to ensure proper error handling.
     
      src/data/dictionary.c                          |    6 +++---
      src/data/gnumeric-reader.c                     |    4 ++--
      src/data/sys-file-reader.c                     |    2 +-
      src/language/data-io/get-data.c                |   12 +++++++-----
      src/language/stats/t-test.q                    |    8 ++++----
      src/libpspp/hmap.c                             |    6 ++++--
      src/libpspp/i18n.c                             |   12 ++++++------
      src/libpspp/message.c                          |    4 ++--
      src/ui/gui/helper.c                            |    4 ++--
      src/ui/gui/psppire-syntax-window.c             |    4 +++-
      src/ui/gui/psppire-window.c                    |    4 ++--
      src/ui/gui/psppire.c                           |    4 ++--
      src/ui/gui/recode-dialog.c                     |    4 ++--
      src/ui/gui/select-cases-dialog.c               |    4 ++--
      src/ui/gui/t-test-independent-samples-dialog.c |   12 ++++++------
      src/ui/gui/widget-io.c                         |    5 +++--
      tests/dissect-sysfile.c                        |    4 ++--
      17 files changed, 53 insertions(+), 46 deletions(-)
     
     commit ef35211c05259417e4f3dd4a7de44e92e4bc54a3
     Author: Ben Pfaff <address@hidden>
     Date:   Tue Apr 7 20:48:10 2009 -0700
     
         Remove redundant test in lex_is_idn().
         
         Commit 90f346cc0 "Made var_is_valid_name more permissive" made 
characters
         with values above 127 valid in identifiers by allowing them in
         lex_is_id1() and lex_is_idn(), but since the latter includes the former
         in its test the addition there is redundant and can be eliminated.
     
      src/data/identifier.c |    4 ++--
      1 files changed, 2 insertions(+), 2 deletions(-)
     
     -- 
     On Perl: "It's as if H.P. Lovecraft, returned from the dead and speaking by
     seance to Larry Wall, designed a language both elegant and terrifying for 
his
     Elder Things to write programs in, and forgot that the Shoggoths didn't 
turn
     out quite so well in the long run." --Matt Olson
     
     
     _______________________________________________
     pspp-dev mailing list
     address@hidden
     http://lists.gnu.org/mailman/listinfo/pspp-dev

-- 
PGP Public key ID: 1024D/2DE827B3 
fingerprint = 8797 A26D 0854 2EAB 0285  A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.

signature.asc
Description: Digital signature