PolicyKit: Branch 'master'
David Zeuthen
david at kemper.freedesktop.org
Mon Nov 5 10:37:38 PST 2007
doc/polkit-docs.xml | 2
polkit/Makefile.am | 3
polkit/polkit-hash.c | 464 ++++++++++++++++++++++++++++++++++++++++++++++++
polkit/polkit-hash.h | 104 ++++++++++
polkit/polkit-memory.c | 78 ++++++++
polkit/polkit-memory.h | 26 ++
polkit/polkit-private.h | 5
polkit/polkit-test.c | 2
polkit/polkit-test.h | 7
polkit/polkit-types.h | 7
10 files changed, 692 insertions(+), 6 deletions(-)
New commits:
commit 7980010a5965d208f7eba467e2c9efac28a60d59
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Nov 5 13:34:45 2007 -0500
implement our own hash table with 100% test coverage
diff --git a/doc/polkit-docs.xml b/doc/polkit-docs.xml
index 98a92d3..bce0d39 100644
--- a/doc/polkit-docs.xml
+++ b/doc/polkit-docs.xml
@@ -84,6 +84,8 @@
</partintro>
<xi:include href="xml/polkit-types.xml"/>
<xi:include href="xml/polkit-sysdeps.xml"/>
+ <xi:include href="xml/polkit-memory.xml"/>
+ <xi:include href="xml/polkit-hash.xml"/>
<xi:include href="xml/polkit-error.xml"/>
<xi:include href="xml/polkit-result.xml"/>
<xi:include href="xml/polkit-action.xml"/>
diff --git a/polkit/Makefile.am b/polkit/Makefile.am
index 835d840..22bc162 100644
--- a/polkit/Makefile.am
+++ b/polkit/Makefile.am
@@ -20,6 +20,8 @@ libpolkitincludedir=$(includedir)/PolicyKit/polkit
libpolkitinclude_HEADERS = \
polkit.h \
polkit-sysdeps.h \
+ polkit-memory.h \
+ polkit-hash.h \
polkit-types.h \
polkit-error.h \
polkit-result.h \
@@ -42,6 +44,7 @@ libpolkit_la_SOURCES = \
polkit-private.h \
polkit-types.h \
polkit-memory.h polkit-memory.c \
+ polkit-hash.h polkit-hash.c \
polkit-sysdeps.h polkit-sysdeps.c \
polkit-error.h polkit-error.c \
polkit-result.h polkit-result.c \
diff --git a/polkit/polkit-hash.c b/polkit/polkit-hash.c
new file mode 100644
index 0000000..d7f6e54
--- /dev/null
+++ b/polkit/polkit-hash.c
@@ -0,0 +1,464 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/***************************************************************************
+ *
+ * polkit-hash.c : Hash tables
+ *
+ * Copyright (C) 2007 David Zeuthen, <david at fubar.dk>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program 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.
+ *
+ * This program 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 this program; 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
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <polkit/polkit-hash.h>
+#include <polkit/polkit-memory.h>
+#include <polkit/polkit-test.h>
+
+/**
+ * SECTION:polkit-hash
+ * @title: Hash Tables
+ * @short_description: Hash Tables.
+ *
+ * This class provides support for hash tables.
+ *
+ * Since: 0.7
+ **/
+
+struct _PolKitHashNode;
+
+typedef struct _PolKitHashNode {
+ void *key;
+ void *value;
+ struct _PolKitHashNode *next;
+} PolKitHashNode;
+
+
+/**
+ * PolKitHash:
+ *
+ * The #PolKitHash structure not be accessed directly.
+ *
+ * Since: 0.7
+ */
+struct _PolKitHash
+{
+ int refcount;
+
+ int num_top_nodes;
+ PolKitHashNode **top_nodes;
+
+ PolKitHashFunc hash_func;
+ PolKitEqualFunc key_equal_func;
+ PolKitFreeFunc key_destroy_func;
+ PolKitFreeFunc value_destroy_func;
+};
+
+/**
+ * polkit_hash_new:
+ * @hash_func: The hash function to use
+ * @key_equal_func: The function used to determine key equality
+ * @key_destroy_func: Function for freeing keys
+ * @value_destroy_func: Function for freeing values
+ *
+ * Creates a new Hash Table.
+ *
+ * Returns: The new hash table. Returns #NULL on OOM.
+ *
+ * Since: 0.7
+ */
+PolKitHash *
+polkit_hash_new (PolKitHashFunc hash_func,
+ PolKitEqualFunc key_equal_func,
+ PolKitFreeFunc key_destroy_func,
+ PolKitFreeFunc value_destroy_func)
+{
+ PolKitHash *h;
+
+ g_return_val_if_fail (hash_func != NULL, NULL);
+ g_return_val_if_fail (key_equal_func != NULL, NULL);
+
+ h = p_new0 (PolKitHash, 1);
+ if (h == NULL)
+ goto error;
+
+ h->refcount = 1;
+ h->hash_func = hash_func;
+ h->key_equal_func = key_equal_func;
+ h->key_destroy_func = key_destroy_func;
+ h->value_destroy_func = value_destroy_func;
+
+ h->num_top_nodes = 11; /* TODO: configurable? */
+ h->top_nodes = p_new0 (PolKitHashNode*, h->num_top_nodes);
+ if (h->top_nodes == NULL)
+ goto error;
+
+ return h;
+error:
+ if (h != NULL)
+ polkit_hash_unref (h);
+ return NULL;
+}
+
+/**
+ * polkit_hash_ref:
+ * @hash: the hash table
+ *
+ * Increase reference count.
+ *
+ * Returns: the hash table
+ *
+ * Since: 0.7
+ */
+PolKitHash *
+polkit_hash_ref (PolKitHash *hash)
+{
+ g_return_val_if_fail (hash != NULL, hash);
+ hash->refcount++;
+ return hash;
+}
+
+/**
+ * polkit_hash_unref:
+ * @hash: the hash table
+ *
+ * Decrease reference count. If reference count drop to zero the hash
+ * table is freed.
+ *
+ * Since: 0.7
+ */
+void
+polkit_hash_unref (PolKitHash *hash)
+{
+ g_return_if_fail (hash != NULL);
+
+ hash->refcount--;
+ if (hash->refcount > 0)
+ return;
+
+ if (hash->top_nodes != NULL) {
+ int n;
+
+ for (n = 0; n < hash->num_top_nodes; n++) {
+ PolKitHashNode *node;
+ PolKitHashNode *next;
+
+ for (node = hash->top_nodes[n]; node != NULL; node = next) {
+ if (hash->key_destroy_func != NULL)
+ hash->key_destroy_func (node->key);
+ if (hash->value_destroy_func != NULL)
+ hash->value_destroy_func (node->value);
+ next = node->next;
+ p_free (node);
+ }
+ }
+ }
+
+ p_free (hash->top_nodes);
+ p_free (hash);
+}
+
+/**
+ * polkit_hash_insert:
+ * @hash: the hash table
+ * @key: key to insert
+ * @value: value to insert
+ *
+ * Inserts a new key and value into a hash table. If the key already
+ * exists in the hash table it's current value is replaced with the
+ * new value.
+ *
+ * Returns: #TRUE unless OOM
+ *
+ * Since: 0.7
+ */
+polkit_bool_t
+polkit_hash_insert (PolKitHash *hash,
+ void *key,
+ void *value)
+{
+ int bucket;
+ polkit_bool_t ret;
+ PolKitHashNode **nodep;
+ PolKitHashNode *node;
+
+ ret = FALSE;
+
+ bucket = hash->hash_func (key) % hash->num_top_nodes;
+
+ nodep = & (hash->top_nodes [bucket]);
+ node = hash->top_nodes [bucket];
+ while (node != NULL) {
+ nodep = &(node->next);
+
+ if (hash->key_equal_func (key, node->key)) {
+ /* replace the value */
+
+ if (hash->key_destroy_func != NULL)
+ hash->key_destroy_func (node->key);
+ if (hash->value_destroy_func != NULL)
+ hash->value_destroy_func (node->value);
+ node->key = key;
+ node->value = value;
+
+ ret = TRUE;
+ goto out;
+ } else {
+ node = node->next;
+ }
+ }
+
+ node = p_new0 (PolKitHashNode, 1);
+ if (node == NULL)
+ goto out;
+
+ node->key = key;
+ node->value = value;
+ *nodep = node;
+
+ ret = TRUE;
+
+out:
+ return ret;
+}
+
+/**
+ * polkit_hash_lookup:
+ * @hash: the hash table
+ * @key: key to look up
+ * @found: if not #NULL, will return #TRUE only if the key was found in the hash table
+ *
+ * Look up a value in the hash table.
+ *
+ * Returns: the value; caller shall not free/unref this value
+ *
+ * Since: 0.7
+ */
+void *
+polkit_hash_lookup (PolKitHash *hash, void *key, polkit_bool_t *found)
+{
+ int bucket;
+ void *value;
+ PolKitHashNode *node;
+
+ bucket = hash->hash_func (key) % hash->num_top_nodes;
+
+ node = hash->top_nodes [bucket];
+ while (node != NULL) {
+ if (hash->key_equal_func (key, node->key)) {
+ /* got it */
+
+ value = node->value;
+ if (found != NULL)
+ *found = TRUE;
+ goto out;
+ } else {
+ node = node->next;
+ }
+ }
+
+ value = NULL;
+ if (found != NULL)
+ *found = FALSE;
+
+out:
+ return value;
+}
+
+
+/**
+ * p_direct_hash:
+ * @key: the key
+ *
+ * Converts a pointer to a hash value.
+ *
+ * Returns: a hash value corresponding to the key
+ *
+ * Since: 0.7
+ */
+polkit_uint32_t
+p_direct_hash (const void *key)
+{
+ /* TODO: reimplement */
+ return g_direct_hash (key);
+}
+
+/**
+ * p_str_hash:
+ * @key: the key
+ *
+ * Converts a string to a hash value.
+ *
+ * Returns: a hash value corresponding to the key
+ *
+ * Since: 0.7
+ */
+polkit_uint32_t
+p_str_hash (const void *key)
+{
+ /* TODO: reimplement */
+ return g_str_hash (key);
+}
+
+/**
+ * p_direct_equal:
+ * @v1: first value
+ * @v2: second value
+ *
+ * Compares to pointers and return #TRUE if they are equal (same address).
+ *
+ * Returns: #TRUE only if the values are equal
+ *
+ * Since: 0.7
+ */
+polkit_bool_t
+p_direct_equal (const void *v1, const void *v2)
+{
+ /* TODO: reimplement */
+ return g_direct_equal (v1, v2);
+}
+
+/**
+ * p_str_equal:
+ * @v1: first value
+ * @v2: second value
+ *
+ * Compares to strings and return #TRUE if they are equal.
+ *
+ * Returns: #TRUE only if the values are equal
+ *
+ * Since: 0.7
+ */
+polkit_bool_t
+p_str_equal (const void *v1, const void *v2)
+{
+ /* TODO: reimplement */
+ return g_str_equal (v1, v2);
+}
+
+
+#ifdef POLKIT_BUILD_TESTS
+
+static polkit_bool_t
+_run_test (void)
+{
+ PolKitHash *h;
+ polkit_bool_t found;
+
+ /* string hash tables */
+ if ((h = polkit_hash_new (p_str_hash, p_str_equal, p_free, p_free)) != NULL) {
+ int n;
+ char *key;
+ char *value;
+ char *test_data[] = {"key1", "val1",
+ "key2", "val2",
+ "key3", "val3",
+ "key4", "val4",
+ "key5", "val5",
+ "key6", "val6",
+ "key7", "val7",
+ "key8", "val8",
+ "key9", "val9",
+ "key10", "val10",
+ "key11", "val11",
+ "key12", "val12",
+ NULL};
+
+ /* first insert the values */
+ for (n = 0; test_data [n*2] != NULL; n++) {
+
+ key = p_strdup (test_data [n*2]);
+
+ if (key == NULL) {
+ goto oom;
+ }
+
+ value = p_strdup (test_data [n*2 + 1]);
+ if (value == NULL) {
+ p_free (key);
+ goto oom;
+ }
+
+ if (!polkit_hash_insert (h, key, value)) {
+ p_free (key);
+ p_free (value);
+ goto oom;
+ }
+ }
+
+ /* then check that we can look them up */
+ for (n = 0; test_data [n*2] != NULL; n++) {
+ key = test_data [n*2];
+ value = polkit_hash_lookup (h, test_data[n*2], &found);
+
+ g_assert (found && strcmp (value, test_data[n*2 + 1]) == 0);
+ }
+
+ /* lookup unknown key */
+ g_assert (polkit_hash_lookup (h, "unknown", &found) == NULL && !found);
+
+ /* replace key */
+ key = p_strdup ("key1");
+ if (key != NULL) {
+ value = p_strdup ("val1-replaced");
+ if (value == NULL) {
+ p_free (key);
+ } else {
+ /* this can never fail because on replace no new node is ever created */
+ g_assert (polkit_hash_insert (h, key, value));
+
+ /* check for replaced value */
+ value = polkit_hash_lookup (h, "key1", &found);
+ g_assert (found && value != NULL && strcmp (value, "val1-replaced") == 0);
+ }
+ }
+
+ polkit_hash_ref (h);
+ polkit_hash_unref (h);
+ oom:
+
+ polkit_hash_unref (h);
+ }
+
+ /* direct hash tables */
+ if ((h = polkit_hash_new (p_direct_hash, p_direct_equal, NULL, NULL)) != NULL) {
+ if (polkit_hash_insert (h, h, h)) {
+ g_assert ((polkit_hash_lookup (h, h, &found) == h) && found);
+ if (polkit_hash_insert (h, h, NULL)) {
+ g_assert (polkit_hash_lookup (h, h, &found) == NULL && found);
+ }
+ }
+ polkit_hash_unref (h);
+ }
+
+ return TRUE;
+}
+
+PolKitTest _test_hash = {
+ "polkit_hash",
+ NULL,
+ NULL,
+ _run_test
+};
+
+#endif /* POLKIT_BUILD_TESTS */
diff --git a/polkit/polkit-hash.h b/polkit/polkit-hash.h
new file mode 100644
index 0000000..493839c
--- /dev/null
+++ b/polkit/polkit-hash.h
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
+/***************************************************************************
+ *
+ * polkit-hash.h : Hash tables
+ *
+ * Copyright (C) 2007 David Zeuthen, <david at fubar.dk>
+ *
+ * Licensed under the Academic Free License version 2.1
+ *
+ * This program 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.
+ *
+ * This program 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ **************************************************************************/
+
+#if !defined (POLKIT_COMPILATION) && !defined(_POLKIT_INSIDE_POLKIT_H)
+#error "Only <polkit/polkit.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef POLKIT_HASH_H
+#define POLKIT_HASH_H
+
+#include <polkit/polkit-types.h>
+
+POLKIT_BEGIN_DECLS
+
+struct _PolKitHash;
+typedef struct _PolKitHash PolKitHash;
+
+/**
+ * PolKitHashFunc:
+ * @key: a key
+ *
+ * The function is passed a key and should return a hash value. The
+ * functions p_direct_hash(), p_int_hash() and p_str_hash() provide
+ * hash functions which can be used when the key is a pointer, an
+ * integer, and char* respectively.
+ *
+ * Returns: the hash value corresponding to the key
+ *
+ * Since: 0.7
+ */
+typedef polkit_uint32_t (*PolKitHashFunc) (const void *key);
+
+/**
+ * PolKitEqualFunc:
+ * @key1: first key
+ * @key2: second key
+ *
+ * Determines if two keys are equal.
+ *
+ * Returns: #TRUE iff the keys are equal
+ *
+ * Since: 0.7
+ */
+typedef polkit_bool_t (*PolKitEqualFunc) (const void *key1, const void *key2);
+
+/**
+ * PolKitFreeFunc:
+ * @p: pointer
+ *
+ * Specifies the type of function which is called when a data element
+ * is destroyed. It is passed the pointer to the data element and
+ * should free any memory and resources allocated for it.
+ *
+ * Since: 0.7
+ */
+typedef void (*PolKitFreeFunc) (void *p);
+
+
+PolKitHash *polkit_hash_new (PolKitHashFunc hash_func,
+ PolKitEqualFunc key_equal_func,
+ PolKitFreeFunc key_destroy_func,
+ PolKitFreeFunc value_destroy_func);
+
+PolKitHash *polkit_hash_ref (PolKitHash *hash);
+void polkit_hash_unref (PolKitHash *hash);
+
+polkit_bool_t polkit_hash_insert (PolKitHash *hash, void *key, void *value);
+
+void *polkit_hash_lookup (PolKitHash *hash, void *key, polkit_bool_t *found);
+
+polkit_uint32_t p_direct_hash (const void *key);
+polkit_uint32_t p_str_hash (const void *key);
+
+
+polkit_bool_t p_direct_equal (const void *v1, const void *v2);
+polkit_bool_t p_str_equal (const void *v1, const void *v2);
+
+POLKIT_END_DECLS
+
+#endif /* POLKIT_TEST_H */
+
+
diff --git a/polkit/polkit-memory.c b/polkit/polkit-memory.c
index 4e88f4d..1c4cc98 100644
--- a/polkit/polkit-memory.c
+++ b/polkit/polkit-memory.c
@@ -33,6 +33,18 @@
#include <glib.h>
#include <polkit/polkit-memory.h>
+#include <polkit/polkit-private.h>
+
+/**
+ * SECTION:polkit-memory
+ * @title: Memory management
+ * @short_description: Memory management
+ *
+ * Functions used for memory management.
+ *
+ * Since: 0.7
+ **/
+
#ifdef POLKIT_BUILD_TESTS
@@ -66,6 +78,16 @@ _polkit_memory_fail_nth_alloc (int number)
_fail_nth = number;
}
+/**
+ * p_malloc:
+ * @bytes: number of 8-bit bytes to allocate
+ *
+ * Allocate memory
+ *
+ * Returns: memory location or #NULL on OOM. Free with p_free().
+ *
+ * Since: 0.7
+ */
void *
p_malloc (size_t bytes)
{
@@ -85,6 +107,16 @@ p_malloc (size_t bytes)
return p;
}
+/**
+ * p_malloc0:
+ * @bytes: number of 8-bit bytes to allocate
+ *
+ * Allocate memory and zero it.
+ *
+ * Returns: memory location or #NULL on OOM. Free with p_free().
+ *
+ * Since: 0.7
+ */
void *
p_malloc0 (size_t bytes)
{
@@ -104,6 +136,14 @@ p_malloc0 (size_t bytes)
return p;
}
+/**
+ * p_free:
+ * @memory: pointer to memory allocated with p_malloc() + friends
+ *
+ * Free memory allocated by p_malloc() + friends.
+ *
+ * Since: 0.7
+ */
void
p_free (void *memory)
{
@@ -113,6 +153,16 @@ p_free (void *memory)
}
}
+/**
+ * p_strdup:
+ * @s: string
+ *
+ * Duplicate a string. Similar to strdup(3).
+ *
+ * Returns: Allocated memory or #NULL on OOM. Free with p_free().
+ *
+ * Since: 0.7
+ */
char *
p_strdup (const char *s)
{
@@ -183,6 +233,20 @@ p_strdup (const char *s)
#endif /* POLKIT_BUILD_TESTS */
+/**
+ * p_strdup_printf:
+ * @format: sprintf(3) format string
+ * @...: the parameters to insert into the format string.
+ *
+ * Similar to the standard C sprintf(3) function but safer, since it
+ * calculates the maximum space required and allocates memory to hold
+ * the result. The returned string should be freed when no longer
+ * needed.
+ *
+ * Returns: A newly allocated string or #NULL on OOM. Free with p_free().
+ *
+ * Since: 0.7
+ */
char*
p_strdup_printf (const char *format, ...)
{
@@ -196,6 +260,20 @@ p_strdup_printf (const char *format, ...)
return s;
}
+/**
+ * p_strdup_vprintf:
+ * @format: printf(3) format string
+ * @args: list of parameters to insert
+ *
+ * Similar to the standard C vsprintf(3) function but safer, since it
+ * calculates the maximum space required and allocates memory to hold
+ * the result. The returned string should be freed when no longer
+ * needed.
+ *
+ * Returns: A newly allocated string or #NULL on OOM. Free with p_free().
+ *
+ * Since: 0.7
+ */
char*
p_strdup_vprintf (const char *format, va_list args)
{
diff --git a/polkit/polkit-memory.h b/polkit/polkit-memory.h
index 7b969d8..f2385a9 100644
--- a/polkit/polkit-memory.h
+++ b/polkit/polkit-memory.h
@@ -38,16 +38,30 @@ POLKIT_BEGIN_DECLS
void *p_malloc (size_t bytes);
void *p_malloc0 (size_t bytes);
void p_free (void *memory);
-char *p_strdup (const char *s);
+/**
+ * p_new:
+ * @type: the type of object to allocate
+ * @count: number of objects to allocate
+ *
+ * Allocate memory for @count structures of type @type.
+ *
+ * Returns: Allocated memory, cast to a pointer of #type or #NULL on OOM.
+ */
#define p_new(type, count) ((type*)p_malloc (sizeof (type) * (count)));
-#define p_new0(type, count) ((type*)p_malloc0 (sizeof (type) * (count)));
-void _polkit_memory_reset (void);
-int _polkit_memory_get_current_allocations (void);
-int _polkit_memory_get_total_allocations (void);
-void _polkit_memory_fail_nth_alloc (int number);
+/**
+ * p_new0:
+ * @type: the type of object to allocate
+ * @count: number of objects to allocate
+ *
+ * Allocate zeroed memory for @count structures of type @type.
+ *
+ * Returns: Allocated memory, cast to a pointer of #type or #NULL on OOM.
+ */
+#define p_new0(type, count) ((type*)p_malloc0 (sizeof (type) * (count)));
+char *p_strdup (const char *s);
char* p_strdup_printf (const char *format, ...);
char* p_strdup_vprintf (const char *format, va_list args);
diff --git a/polkit/polkit-private.h b/polkit/polkit-private.h
index 0274bd6..ea878ff 100644
--- a/polkit/polkit-private.h
+++ b/polkit/polkit-private.h
@@ -36,6 +36,11 @@
POLKIT_BEGIN_DECLS
+void _polkit_memory_reset (void);
+int _polkit_memory_get_current_allocations (void);
+int _polkit_memory_get_total_allocations (void);
+void _polkit_memory_fail_nth_alloc (int number);
+
PolKitAuthorization *_polkit_authorization_new_for_uid (const char *entry_in_auth_file, uid_t uid);
const char *_polkit_authorization_get_authfile_entry (PolKitAuthorization *auth);
diff --git a/polkit/polkit-test.c b/polkit/polkit-test.c
index a0a9569..df6a6dd 100644
--- a/polkit/polkit-test.c
+++ b/polkit/polkit-test.c
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <polkit/polkit-test.h>
#include <polkit/polkit-memory.h>
+#include <polkit/polkit-private.h>
#define MAX_TESTS 64
@@ -39,6 +40,7 @@ static PolKitTest *tests[] = {
&_test_caller,
&_test_policy_default,
&_test_policy_file_entry,
+ &_test_hash,
};
int
diff --git a/polkit/polkit-test.h b/polkit/polkit-test.h
index 6ccfb0d..cf85714 100644
--- a/polkit/polkit-test.h
+++ b/polkit/polkit-test.h
@@ -37,7 +37,13 @@ POLKIT_BEGIN_DECLS
polkit_bool_t _test_polkit_action (void);
polkit_bool_t _test_polkit_error (void);
+/**
+ * PolKitTest:
+ *
+ * Test suite abstraction.
+ */
typedef struct {
+ /*< private >*/
const char *name;
void (*setup) (void);
void (*teardown) (void);
@@ -52,6 +58,7 @@ extern PolKitTest _test_session;
extern PolKitTest _test_caller;
extern PolKitTest _test_policy_default;
extern PolKitTest _test_policy_file_entry;
+extern PolKitTest _test_hash;
POLKIT_END_DECLS
diff --git a/polkit/polkit-types.h b/polkit/polkit-types.h
index 8bcf1ad..969af78 100644
--- a/polkit/polkit-types.h
+++ b/polkit/polkit-types.h
@@ -78,6 +78,13 @@ POLKIT_BEGIN_DECLS
typedef int polkit_bool_t;
/**
+ * polkit_uint32_t:
+ *
+ * Type for unsigned 32 bit integer.
+ */
+typedef unsigned int polkit_uint32_t;
+
+/**
* polkit_uint64_t:
*
* Type for unsigned 64 bit integer.
More information about the hal-commit
mailing list