No need to add 1 to arg passed to ds_extend(), because the argument

does not include space for a null terminator.  Also, fix warning.

diff --git a/src/libpspp/ChangeLog b/src/libpspp/ChangeLog
index b3c5b065b9513505ec8c05136de3dd30e71a41f4..6375857a66230b277c132907b244b37e1529874b 100644 (file)
--- a/src/libpspp/ChangeLog
+++ b/src/libpspp/ChangeLog
@@ -1,3 +1,9 @@
+Tue May  2 15:41:50 2006  Ben Pfaff  <blp@gnu.org>
+
+       * str.c (ds_append_uninit): No need to add 1 to arg passed to
+       ds_extend(), because the argument does not include space for a
+       null terminator.  Also, fix warning.
+

 Tue Apr 25 11:07:19 2006  Ben Pfaff  <blp@gnu.org>
 
        Finish reforming error message support.  In this phase, move
 Tue Apr 25 11:07:19 2006  Ben Pfaff  <blp@gnu.org>
 
        Finish reforming error message support.  In this phase, move

diff --git a/src/libpspp/str.c b/src/libpspp/str.c
index 613ecbc5455c69549c2880a3944ed124bfcaf502..c4ce9c512b74a94a919dc06aff46d9983b5b5c38 100644 (file)
--- a/src/libpspp/str.c
+++ b/src/libpspp/str.c
@@ -681,14 +681,13 @@ ds_concat (struct string *st, const char *buf, size_t len)
   st->length += len;
 }
 
   st->length += len;
 }
 

-/* Returns ds_end(ST) and THEN increases the length by INCR */
+/* Returns ds_end(ST) and THEN increases the length by INCR. */

 char *
 ds_append_uninit(struct string *st, size_t incr)
 {
 char *
 ds_append_uninit(struct string *st, size_t incr)
 {

-  char *end ;
-  assert(incr >= 0 );
+  char *end;

 
 

-  ds_extend(st, ds_length(st) + incr + 1);
+  ds_extend(st, ds_length(st) + incr);

 
   end = ds_end(st);
 
 
   end = ds_end(st);