Adding upstream version 2.12.0.upstream/2.12.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 78 insertions, 0 deletions

diff --git a/lib/glcontainers.c b/lib/glcontainers.c
new file mode 100644
index 0000000..4cbe4ba
--- /dev/null
+++ b/lib/glcontainers.c
@@ -0,0 +1,78 @@
+/*
+ * glcontainers.c: common Gnulib container helpers
+ *
+ * Copyright (C) 2019 Colin Watson.
+ *
+ * This file is part of man-db.
+ *
+ * man-db is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * man-db is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with man-db; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif /* HAVE_CONFIG_H */
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "attribute.h"
+#include "gl_xlist.h"
+#include "gl_xmap.h"
+#include "gl_xset.h"
+#include "hash-pjw-bare.h"
+
+#include "manconfig.h"
+
+#include "glcontainers.h"
+
+bool ATTRIBUTE_PURE string_equals (const void *s1, const void *s2)
+{
+	return STREQ ((const char *) s1, (const char *) s2);
+}
+
+size_t ATTRIBUTE_PURE string_hash (const void *s)
+{
+	return hash_pjw_bare (s, strlen ((const char *) s));
+}
+
+void plain_free (const void *s)
+{
+	/* gl_list declares the argument as const, but there doesn't seem to
+	 * be a good reason for this.
+	 */
+	free ((void *) s);
+}
+
+gl_list_t new_string_list (gl_list_implementation_t implementation,
+			   bool allow_duplicates)
+{
+	return gl_list_create_empty (implementation, string_equals,
+				     string_hash, plain_free,
+				     allow_duplicates);
+}
+
+gl_map_t new_string_map (gl_map_implementation_t implementation,
+			 gl_mapvalue_dispose_fn vdispose_fn)
+{
+	return gl_map_create_empty (implementation, string_equals, string_hash,
+				    plain_free, vdispose_fn);
+}
+
+gl_set_t new_string_set (gl_set_implementation_t implementation)
+{
+	return gl_set_create_empty (implementation, string_equals, string_hash,
+				    plain_free);
+}