X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmeans.q;h=887cbfd8525d1cabdae9395d5db421cdf8b32c1b;hb=4a73877b4d56caed03d383fb4d38347a9774046f;hp=7dca14b2ffdb364c87570fc415ee75312645a30f;hpb=b321086267ad1014dc5d09886396cde30f094437;p=pspp-builds.git diff --git a/src/means.q b/src/means.q index 7dca14b2..887cbfd8 100644 --- a/src/means.q +++ b/src/means.q @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include #include @@ -29,6 +29,10 @@ #include "error.h" #include "magic.h" #include "var.h" + +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* (headers) */ #include "debug-print.h" @@ -49,7 +53,7 @@ /* TABLES: Variable lists for each dimension. */ int n_dim; /* Number of dimensions. */ -int *nv_dim; /* Number of variables in each dimension. */ +size_t *nv_dim; /* Number of variables in each dimension. */ struct variable ***v_dim; /* Variables in each dimension. */ /* VARIABLES: List of variables. */ @@ -141,7 +145,7 @@ mns_custom_tables (struct cmd_means *cmd) do { - int nvl; + size_t nvl; struct variable **vl; if (!parse_var_set_vars (var_set, &vl, &nvl, @@ -149,8 +153,8 @@ mns_custom_tables (struct cmd_means *cmd) goto lossage; n_dim++; - nv_dim = xrealloc (nv_dim, n_dim * sizeof (int)); - v_dim = xrealloc (v_dim, n_dim * sizeof (struct variable **)); + nv_dim = xnrealloc (nv_dim, n_dim, sizeof *nv_dim); + v_dim = xnrealloc (v_dim, n_dim, sizeof *v_dim); nv_dim[n_dim - 1] = nvl; v_dim[n_dim - 1] = vl;