base64: fix for unsigned chars (e.g. ARM).

[ccan] / ccan / opt / private.h

diff --git a/ccan/opt/private.h b/ccan/opt/private.h
index b1a189234974bb8250102cd3a073f00b6bb503e2..0621c82eb6bcc693c3d2b6fcee0d30e25f720bf8 100644 (file)
--- a/ccan/opt/private.h
+++ b/ccan/opt/private.h
@@ -1,11 +1,27 @@
+/* Licensed under GPLv2+ - see LICENSE file for details */
 #ifndef CCAN_OPT_PRIVATE_H
 #define CCAN_OPT_PRIVATE_H
 
 extern struct opt_table *opt_table;
-extern unsigned int opt_count;
+extern unsigned int opt_count, opt_num_short, opt_num_short_arg, opt_num_long;
 
 extern const char *opt_argv0;
 
-#define subtable_of(entry) ((struct opt_table *)((entry)->longopt))
+#define subtable_of(entry) ((const struct opt_table *)((entry)->names))
+
+const char *first_sopt(unsigned *i);
+const char *next_sopt(const char *names, unsigned *i);
+const char *first_lopt(unsigned *i, unsigned *len);
+const char *next_lopt(const char *p, unsigned *i, unsigned *len);
+
+struct opt_alloc {
+       void *(*alloc)(size_t size);
+       void *(*realloc)(void *ptr, size_t size);
+       void (*free)(void *ptr);
+};
+extern struct opt_alloc opt_alloc;
+
+int parse_one(int *argc, char *argv[], enum opt_type is_early, unsigned *offset,
+             void (*errlog)(const char *fmt, ...), bool unknown_ok);
 
 #endif /* CCAN_OPT_PRIVATE_H */