X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Flazy-casereader.c;h=7663180863fd2fea1fd7dd72c97a75c1501ed42c;hb=2bf186a3ffb77c2706223d24bad200cb3148cc8a;hp=44897d165a3537fa69d9cdaf7c3418e24031bfab;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp diff --git a/src/data/lazy-casereader.c b/src/data/lazy-casereader.c index 44897d165a..7663180863 100644 --- a/src/data/lazy-casereader.c +++ b/src/data/lazy-casereader.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,16 +16,16 @@ #include -#include +#include "data/lazy-casereader.h" #include -#include -#include -#include -#include +#include "data/case.h" +#include "data/casereader.h" +#include "data/casereader-provider.h" +#include "libpspp/assertion.h" -#include "xalloc.h" +#include "gl/xalloc.h" /* A lazy casereader's auxiliary data. */ struct lazy_casereader @@ -52,7 +52,7 @@ static const struct casereader_class lazy_casereader_class; data source or CASENUMBER_MAX if the number of cases cannot be predicted in advance. */ struct casereader * -lazy_casereader_create (const struct caseproto *proto, casenumber case_cnt, +lazy_casereader_create (const struct caseproto *proto, casenumber n_cases, struct casereader *(*callback) (void *aux), void *aux, unsigned long int *serial) { @@ -63,7 +63,7 @@ lazy_casereader_create (const struct caseproto *proto, casenumber case_cnt, *serial = lc->serial = next_serial++; lc->callback = callback; lc->aux = aux; - return casereader_create_sequential (NULL, proto, case_cnt, + return casereader_create_sequential (NULL, proto, n_cases, &lazy_casereader_class, lc); }