X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsorter%2Fsorter.h;h=56ccec55df53104f0e1d600815eb574492779f9f;hb=396f0bc99fd49bfdac3bcc6681342fe76d4f79df;hp=a380bec786bea3d50660e8624b0905d751a377c0;hpb=baa9f9a3368c8d318b9711340727f822d8fc8a34;p=libucw.git

diff --git a/lib/sorter/sorter.h b/lib/sorter/sorter.h
index a380bec7..56ccec55 100644
--- a/lib/sorter/sorter.h
+++ b/lib/sorter/sorter.h
@@ -57,11 +57,10 @@
  *  Unification:
  *
  *  SORT_UNIFY		merge items with identical keys, needs the following functions:
- *  void PREFIX_write_merged(struct fastbuf *f, SORT_KEY **keys, uns n, byte *buf)
+ *  void PREFIX_write_merged(struct fastbuf *f, SORT_KEY **keys, void **data, uns n, void *buf)
  *			takes n records in memory with keys which compare equal and writes
- *			a single record to the given fastbuf. Data for each key can
- *			be accessed by the SORT_GET_DATA(*key) macro. `buf' points
- *			to a buffer which is guaranteed to hold all given records.
+ *			a single record to the given fastbuf. `buf' points to a buffer which
+ *			is guaranteed to hold all given records.
  *  void PREFIX_copy_merged(SORT_KEY **keys, struct fastbuf **data, uns n, struct fastbuf *dest)
  *			takes n records with keys in memory and data in fastbufs and writes
  *			a single record.
@@ -71,7 +70,7 @@
  *  SORT_INPUT_FILE	file of a given name
  *  SORT_INPUT_FB	fastbuf stream
  *  SORT_INPUT_PRESORT	custom presorter. Calls function
- *  int PREFIX_presort(struct fastbuf *dest, byte *buf, size_t bufsize);
+ *  int PREFIX_presort(struct fastbuf *dest, void *buf, size_t bufsize);
  *			to get successive batches of pre-sorted data.
  *			The function is passed a page-aligned presorting buffer.
  *			It returns 1 on success or 0 on EOF.
@@ -243,6 +242,7 @@ static struct fastbuf *P(sort)(
   return ctx.out_fb;
 }
 
+#undef SORT_PREFIX
 #undef SORT_KEY
 #undef SORT_KEY_REGULAR
 #undef SORT_KEY_SIZE