intmap: add test case which failed, extracted from real world usage.

[ccan] / ccan / intmap / intmap.h

diff --git a/ccan/intmap/intmap.h b/ccan/intmap/intmap.h
index be3dbc0936b40f9133b4caad30b4a49c62c1bd42..07a86351597dadb6f367b570ee132eab10733d33 100644 (file)
--- a/ccan/intmap/intmap.h
+++ b/ccan/intmap/intmap.h
@@ -309,6 +309,32 @@ void *intmap_after_(const struct intmap *map, intmap_index_t *indexp);
        tcon_cast((smap), sintmap_canary,                               \
                  sintmap_after_(sintmap_unwrap_(smap), (indexp)))
 
+/**
+ * uintmap_last - get last value in an unsigned intmap
+ * @umap: the typed intmap to iterate through.
+ * @indexp: a pointer to store the index.
+ *
+ * Returns NULL if the map is empty, otherwise populates *@indexp and
+ * returns the highest entry.
+ */
+#define uintmap_last(umap, indexp)                                     \
+       tcon_cast((umap), uintmap_canary,                               \
+                 intmap_last_(uintmap_unwrap_(umap), (indexp)))
+
+void *intmap_last_(const struct intmap *map, intmap_index_t *indexp);
+
+/**
+ * sintmap_last - get last value in a signed intmap
+ * @smap: the typed intmap to iterate through.
+ * @indexp: a pointer to store the index.
+ *
+ * Returns NULL if the map is empty, otherwise populates *@indexp and
+ * returns the highest entry.
+ */
+#define sintmap_last(smap, indexp)                                     \
+       tcon_cast((smap), sintmap_canary,                               \
+                 sintmap_last_(sintmap_unwrap_(smap), (indexp)))
+
 /* TODO: We could implement intmap_prefix. */
 
 /* These make sure it really is a uintmap/sintmap */
@@ -339,4 +365,14 @@ static inline void *sintmap_after_(const struct intmap *map,
        *indexp = SINTMAP_UNOFF(i);
        return ret;
 }
+
+static inline void *sintmap_last_(const struct intmap *map,
+                                 sintmap_index_t *indexp)
+{
+       intmap_index_t i;
+       void *ret = intmap_last_(map, &i);
+       *indexp = SINTMAP_UNOFF(i);
+       return ret;
+
+}
 #endif /* CCAN_INTMAP_H */