From: Andreas Schlick <schlick@lavabit.com>
Date: Fri, 4 Mar 2011 16:08:06 +0000 (+0100)
Subject: asort: Remove constness from ctx pointer.
X-Git-Url: https://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=376edd78d31c1c542e19ae896006cd17ccb459f0;hp=abac60537ea825400dce4d34c5406b8e48783102

asort: Remove constness from ctx pointer.
---

diff --git a/ccan/asort/asort.c b/ccan/asort/asort.c
index ce12fe66..9f586861 100644
--- a/ccan/asort/asort.c
+++ b/ccan/asort/asort.c
@@ -3,8 +3,8 @@
 
 #if HAVE_NESTED_FUNCTIONS
 void _asort(void *base, size_t nmemb, size_t size,
-	    int(*compar)(const void *, const void *, const void *ctx),
-	    const void *ctx)
+	    int(*compar)(const void *, const void *, void *ctx),
+	    void *ctx)
 {
 	/* This gives bogus "warning: no previous prototype for ‘cmp’"
 	 * with gcc 4 with -Wmissing-prototypes.  Hence the auto crap. */
@@ -107,8 +107,8 @@ typedef struct
 
 void
 _asort (void *const pbase, size_t total_elems, size_t size,
-	int(*cmp)(const void *, const void *, const void *arg),
-	const void *arg)
+	int(*cmp)(const void *, const void *, void *arg),
+	void *arg)
 {
   register char *base_ptr = (char *) pbase;
 
diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 731f9bde..eaaa5b19 100644
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -18,14 +18,14 @@
  */
 #define asort(base, num, cmp, ctx)					\
 _asort((base), (num), sizeof(*(base)),					\
-       cast_if_type(int (*)(const void *, const void *, const void *),	\
+       cast_if_type(int (*)(const void *, const void *, void *),	\
 		    (cmp), &*(cmp),					\
 		    int (*)(const __typeof__(*(base)) *,		\
 			    const __typeof__(*(base)) *,		\
 			    __typeof__(ctx))), (ctx))
 
 void _asort(void *base, size_t nmemb, size_t size,
-	    int(*compar)(const void *, const void *, const void *),
-	    const void *ctx);
+	    int(*compar)(const void *, const void *, void *),
+	    void *ctx);
 
 #endif /* CCAN_ASORT_H */