Re: xallocsa gone from gnulib

[Ben Pfaff]

John Darrington <address@hidden> writes:

> The recent changes to psppire-case-file.c no longer compile, because
> the functions have disappeared from gnulib
>
> I'm not sure what the appropriate replacements are.

The gnulib NEWS says that it was renamed xmalloca.  I checked
this in:

diff -u -p -r1.77 ChangeLog
--- ChangeLog   7 Jun 2007 06:41:58 -0000       1.77
+++ ChangeLog   14 Jun 2007 14:21:10 -0000
@@ -1,3 +1,8 @@
+2007-06-14  Ben Pfaff  <address@hidden>
+
+       * Smake: Use xmalloca instead of xallocsa due to module renaming.
+       Update all uses.
+
 2007-06-06  Ben Pfaff  <address@hidden>
 
        * Smake: Add xallocsa to modules.
diff -u -p -r1.59 Smake
--- Smake       7 Jun 2007 06:41:59 -0000       1.59
+++ Smake       14 Jun 2007 14:21:10 -0000
@@ -62,7 +62,7 @@ GNULIB_MODULES = \
        vsnprintf \
        xalloc \
        xalloc-die \
-       xallocsa \
+       xmalloca \
        xsize \
        xstrndup \
        xvasprintf
--- src/ui/gui/psppire-case-file.c      12 Jun 2007 01:59:00 -0000      1.20
+++ src/ui/gui/psppire-case-file.c      14 Jun 2007 14:21:10 -0000
@@ -32,7 +32,7 @@
 #include <libpspp/misc.h>
 
 #include "xalloc.h"
-#include "xallocsa.h"
+#include "xmalloca.h"
 
 /* --- prototypes --- */
 static void psppire_case_file_class_init       (PsppireCaseFileClass   *class);
@@ -312,7 +312,7 @@ psppire_case_file_data_in (PsppireCaseFi
   g_return_val_if_fail (idx < datasheet_get_column_cnt (cf->datasheet), FALSE);
 
   width = fmt_var_width (fmt);
-  value = xallocsa (value_cnt_from_width (width) * sizeof *value);
+  value = xmalloca (value_cnt_from_width (width) * sizeof *value);
   ok = (datasheet_get_value (cf->datasheet, casenum, idx, value, width)
         && data_in (input, fmt->type, 0, 0, value, width)
         && datasheet_put_value (cf->datasheet, casenum, idx, value, width));

-- 
Ben Pfaff 
http://benpfaff.org