X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=debug%2Fsorter%2Fretros.c;h=ea6de037ea0ddf662bd8e8d0123797e80f79f1f5;hb=ccf0d79b2a55614e40afc6ad6dff231a86df4a70;hp=2281b733b44b3f5758b501fae5f4fd308c5ae5f2;hpb=e34560a76a7af3fb428604e4da3cd14cfd1bf454;p=libucw.git

diff --git a/debug/sorter/retros.c b/debug/sorter/retros.c
index 2281b733..ea6de037 100644
--- a/debug/sorter/retros.c
+++ b/debug/sorter/retros.c
@@ -1,10 +1,12 @@
 /*
- *  An experiment with sorting algorithms
+ *  Experiments with various sorting algorithms
+ *
+ *  (c) 2007 Martin Mares <mj@ucw.cz>
  */
 
 #include "sherlock/sherlock.h"
-#include "lib/getopt.h"
-#include "lib/md5.h"
+#include "ucw/getopt.h"
+#include "ucw/md5.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,13 +50,13 @@ static int comp_ind(const void *x, const void *y)
 #define ASORT_ELT(i) a[i].key
 #define ASORT_SWAP(i,j) do { struct elt t=a[i]; a[i]=a[j]; a[j]=t; } while (0)
 #define ASORT_EXTRA_ARGS , struct elt *a
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 #define ASORT_PREFIX(x) asi_##x
 #define ASORT_KEY_TYPE u32
 #define ASORT_ELT(i) ind[i]->key
 #define ASORT_SWAP(i,j) do { struct elt *t=ind[i]; ind[i]=ind[j]; ind[j]=t; } while (0)
-#include "lib/arraysort.h"
+#include "ucw/arraysort.h"
 
 static void r1_sort(void)
 {
@@ -616,8 +618,8 @@ static void mk_ary(void)
 {
   ary = array0;
   alt = array1;
-  struct MD5Context ctx;
-  MD5Init(&ctx);
+  md5_context ctx;
+  md5_init(&ctx);
   u32 block[16];
   bzero(block, sizeof(block));
 
@@ -628,7 +630,7 @@ static void mk_ary(void)
       if (!(i % 4))
 	{
 	  block[i%16] = i;
-	  MD5Transform(ctx.buf, block);
+	  md5_transform(ctx.buf, block);
 	}
       ary[i].key = ctx.buf[i%4];
 #else