[ovs-dev] [bug15983 1/4] sset: New function sset_sort().
Ben Pfaff
blp at nicira.com
Wed Apr 10 17:35:23 UTC 2013
This will have its first caller in an upcoming commit.
Signed-off-by: Ben Pfaff <blp at nicira.com>
---
lib/sset.c | 36 +++++++++++++++++++++++++++++++++++-
lib/sset.h | 4 +++-
2 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/lib/sset.c b/lib/sset.c
index c5b616f..443538d 100644
--- a/lib/sset.c
+++ b/lib/sset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -268,3 +268,37 @@ sset_at_position(const struct sset *set, uint32_t *bucketp, uint32_t *offsetp)
hmap_node = hmap_at_position(&set->map, bucketp, offsetp);
return SSET_NODE_FROM_HMAP_NODE(hmap_node);
}
+
+static int
+compare_string_pointers(const void *a_, const void *b_)
+{
+ const char *const *a = a_;
+ const char *const *b = b_;
+
+ return strcmp(*a, *b);
+}
+
+/* Returns a null-terminated array of pointers to the strings in 'set', sorted
+ * alphabetically. The caller must free the returned array when it is no
+ * longer needed, but the strings in the array belong to 'set' and thus must
+ * not be modified or freed. */
+const char **
+sset_sort(const struct sset *set)
+{
+ size_t n = sset_count(set);
+ const char **array;
+ const char *s;
+ size_t i;
+
+ array = xmalloc(sizeof *array * (n + 1));
+ i = 0;
+ SSET_FOR_EACH (s, set) {
+ array[i++] = s;
+ }
+ ovs_assert(i == n);
+ array[n] = NULL;
+
+ qsort(array, n, sizeof *array, compare_string_pointers);
+
+ return array;
+}
diff --git a/lib/sset.h b/lib/sset.h
index 327074c..625cea9 100644
--- a/lib/sset.h
+++ b/lib/sset.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -79,6 +79,8 @@ struct sset_node *sset_at_position(const struct sset *,
? (NEXT) = SSET_NEXT(SSET, NAME), true \
: false); \
(NAME) = (NEXT))
+
+const char **sset_sort(const struct sset *);
/* Implementation helper macros. */
--
1.7.10.4
More information about the dev
mailing list