X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fsorter.h;h=71fcff1ecc6cbe4011290d7dbfe4b899996e1ad3;hb=1386442ebc5b681b0ded431880198e3beb6da483;hp=64092d6cafcc46f0bd9663ac9312c8c91b9a88a2;hpb=3a4df62d817e0e6c854f44dfb5b78ef3eac953b9;p=libucw.git diff --git a/lib/sorter.h b/lib/sorter.h index 64092d6c..71fcff1e 100644 --- a/lib/sorter.h +++ b/lib/sorter.h @@ -50,7 +50,7 @@ * int PREFIX_compare(SORT_KEY *a, *b) * compare two keys, result like strcmp * int PREFIX_fetch_key(struct fastbuf *f, SORT_KEY *k) - * fetch next key, returns 1=ok, 0=eof + * fetch next key, returns nonzero=ok, 0=eof * void PREFIX_copy_data(struct fastbuf *src, *dest, SORT_KEY *k) * write just fetched key k to dest and copy all data * belonging to this key from src to dest. @@ -401,7 +401,7 @@ P(presort)(struct fastbuf **fb1, struct fastbuf **fb2) } for(;;) { - current = (byte *) ALIGN((addr_int_t) current, CPU_STRUCT_ALIGN); + current = (byte *) ALIGN_TO((uintptr_t) current, CPU_STRUCT_ALIGN); if (current + sizeof(*this) > bufend) break; this = (SORT_NODE *) current;