X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fsortidx.c;h=979d919755654b37d8a762572f2d189d4d13888e;hb=c33ea56e3771c3b80ba66ef8fda3a09cad171ebb;hp=d9c3fb8e9a5b839e4b42220b5f06c3b4ef1f2209;hpb=0b916c43a55c3d66e938fa5f19b51a230c448777;p=idzebra-moved-to-github.git diff --git a/index/sortidx.c b/index/sortidx.c index d9c3fb8..979d919 100644 --- a/index/sortidx.c +++ b/index/sortidx.c @@ -1,5 +1,5 @@ -/* $Id: sortidx.c,v 1.15 2005-08-18 19:20:38 adam Exp $ - Copyright (C) 1995-2005 +/* $Id: sortidx.c,v 1.18 2006-08-14 10:40:15 adam Exp $ + Copyright (C) 1995-2006 Index Data ApS This file is part of the Zebra server. @@ -15,13 +15,13 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Zebra; see the file LICENSE.zebra. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ - +#include #include #include @@ -140,7 +140,18 @@ void sortIdx_add (SortIdx si, const char *buf, int len) void sortIdx_read (SortIdx si, char *buf) { - int r = bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf); + int r; + + assert(si->current_file); + r = bf_read (si->current_file->bf, si->sysno+1, 0, 0, buf); if (!r) memset (buf, 0, SORT_IDX_ENTRYSIZE); } +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +