projects
/
jansson.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Resolve __va_list_tag ** -> va_list * type errors with clang and future GCCs
[jansson.git]
/
src
/
hashtable.h
diff --git
a/src/hashtable.h
b/src/hashtable.h
index
6d3c736
..
5aed14f
100644
(file)
--- a/
src/hashtable.h
+++ b/
src/hashtable.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009
, 2010
Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009
-2011
Petri Lehtinen <petri@digip.org>
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
*
* This library is free software; you can redistribute it and/or modify
* it under the terms of the MIT license. See LICENSE for details.
@@
-8,7
+8,7
@@
#ifndef HASHTABLE_H
#define HASHTABLE_H
#ifndef HASHTABLE_H
#define HASHTABLE_H
-typedef
unsigned in
t (*key_hash_fn)(const void *key);
+typedef
size_
t (*key_hash_fn)(const void *key);
typedef int (*key_cmp_fn)(const void *key1, const void *key2);
typedef void (*free_fn)(void *key);
typedef int (*key_cmp_fn)(const void *key1, const void *key2);
typedef void (*free_fn)(void *key);
@@
-20,7
+20,7
@@
struct hashtable_list {
struct hashtable_pair {
void *key;
void *value;
struct hashtable_pair {
void *key;
void *value;
-
unsigned in
t hash;
+
size_
t hash;
struct hashtable_list list;
};
struct hashtable_list list;
};
@@
-30,9
+30,9
@@
struct hashtable_bucket {
};
typedef struct hashtable {
};
typedef struct hashtable {
-
unsigned in
t size;
+
size_
t size;
struct hashtable_bucket *buckets;
struct hashtable_bucket *buckets;
-
unsigned in
t num_buckets; /* index to primes[] */
+
size_
t num_buckets; /* index to primes[] */
struct hashtable_list list;
key_hash_fn hash_key;
struct hashtable_list list;
key_hash_fn hash_key;
@@
-161,7
+161,7
@@
void hashtable_clear(hashtable_t *hashtable);
void *hashtable_iter(hashtable_t *hashtable);
/**
void *hashtable_iter(hashtable_t *hashtable);
/**
- * hashtable_iter - Return an iterator at a specific key
+ * hashtable_iter
_at
- Return an iterator at a specific key
*
* @hashtable: The hashtable object
* @key: The key that the iterator should point to
*
* @hashtable: The hashtable object
* @key: The key that the iterator should point to