ccan: Correct some poor conventions in _info includes

[ccan] / ccan / crcsync / _info

diff --git a/ccan/crcsync/_info b/ccan/crcsync/_info
index 52e2ebe2febdc65f8e0831500567edd3cb13d50c..9ebb8bd8a01e7e844ccc62e90bc0454d11904781 100644 (file)
--- a/ccan/crcsync/_info
+++ b/ccan/crcsync/_info
@@ -1,6 +1,6 @@
+#include "config.h"
 #include <stdio.h>
 #include <string.h>
-#include "config.h"
 
 /**
  * crcsync - routines to use crc for an rsync-like protocol.
@@ -12,7 +12,8 @@
  *     // Calculate checksums of file (3-arg mode)
  *     // Or print differences between file and checksums (4+ arg mode)
  *     #include <ccan/crcsync/crcsync.h>
- *     #include <ccan/grab_file/grab_file.h>
+ *     #include <ccan/tal/grab_file/grab_file.h>
+ *     #include <ccan/tal/tal.h>
  *     #include <stdio.h>
  *     #include <stdlib.h>
  *     #include <err.h>
@@ -30,24 +31,25 @@
  *             size_t len, used, blocksize;
  *             char *file;
  *             struct crc_context *ctx;
- *             uint32_t *crcs;
+ *             uint64_t *crcs;
  *             long res, i;
  *     
  *             if (argc < 3 || (blocksize = atoi(argv[1])) == 0)
  *                     errx(1, "Usage: %s <blocksize> <file> <crc>...\n"
  *                          "OR: %s <blocksize> <file>", argv[0], argv[0]);
  *     
- *             file = grab_file(NULL, argv[2], &len);
+ *             file = grab_file(NULL, argv[2]);
  *             if (!file)
  *                     err(1, "Opening file %s", argv[2]);
- *     
+ *             len = tal_count(file) - 1;
+ *
  *             if (argc == 3) {
  *                     // Short form prints CRCs of file for use in long form.
  *                     used = (len + blocksize - 1) / blocksize;
- *                     crcs = malloc(used * sizeof(uint32_t));
+ *                     crcs = malloc(used * sizeof(crcs[0]));
  *                     crc_of_blocks(file, len, blocksize, 32, crcs);
  *                     for (i = 0; i < used; i++)
- *                             printf("%i ", crcs[i]);
+ *                             printf("%llu ", (long long)crcs[i]);
  *                     printf("\n");
  *                     return 0;
  *             }
@@ -56,7 +58,7 @@
  *             for (i = 0; i < argc-3; i++)
  *                     crcs[i] = atoi(argv[3+i]);
  *     
- *             ctx = crc_context_new(blocksize, 32, crcs, argc-3);
+ *             ctx = crc_context_new(blocksize, 32, crcs, argc-3, 0);
  *             for (used = 0; used < len; ) {
  *                     used += crc_read_block(ctx, &res, file+used, len-used);
  *                     print_result(res);
@@ -67,7 +69,11 @@
  *             return 0;
  *     }
  *
- * Licence: LGPL (v2 or any later version)
+ * License: LGPL (v2.1 or any later version)
+ * Author: Rusty Russell <rusty@rustcorp.com.au>
+ * Ccanlint:
+ *     // We actually depend on the GPL crc routines, so not really LGPL :(
+ *     license_depends_compat FAIL
  */
 int main(int argc, char *argv[])
 {
@@ -78,6 +84,10 @@ int main(int argc, char *argv[])
                printf("ccan/crc\n");
                return 0;
        }
+       if (strcmp(argv[1], "testdepends") == 0) {
+               printf("ccan/array_size\n");
+               return 0;
+       }
 
        return 1;
 }