torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson
2014-02-15 00:03:29 -05:00
parent 1987894626 e4bc757cde
commit 339a47e80b
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/compat.h
+2
View File
@@ -169,6 +169,7 @@ extern INLINE double U64_TO_DBL(uint64_t x) {
*
* #define ATTR_NONNULL(x) __attribute__((nonnull x)) */
#define ATTR_NONNULL(x)
#define ATTR_UNUSED __attribute__ ((unused))
/** Macro: Evaluates to <b>exp</b> and hints the compiler that the value
* of <b>exp</b> will probably be true.
@@ -192,6 +193,7 @@ extern INLINE double U64_TO_DBL(uint64_t x) {
#define ATTR_MALLOC
#define ATTR_NORETURN
#define ATTR_NONNULL(x)
#define ATTR_UNUSED
#define PREDICT_LIKELY(exp) (exp)
#define PREDICT_UNLIKELY(exp) (exp)
#endif
src/common/container.h
+28 -18
View File
@@ -472,64 +472,74 @@ void* strmap_remove_lc(strmap_t *map, const char *key);
#define DECLARE_TYPED_DIGESTMAP_FNS(prefix, maptype, valtype) \
typedef struct maptype maptype; \
typedef struct prefix##iter_t prefix##iter_t; \
static INLINE maptype* prefix##new(void) \
ATTR_UNUSED static INLINE maptype* \
prefix##new(void) \
{ \
return (maptype*)digestmap_new(); \
} \
static INLINE digestmap_t* prefix##to_digestmap(maptype *map) \
ATTR_UNUSED static INLINE digestmap_t* \
prefix##to_digestmap(maptype *map) \
{ \
return (digestmap_t*)map; \
} \
static INLINE valtype* prefix##get(maptype *map, const char *key) \
ATTR_UNUSED static INLINE valtype* \
prefix##get(maptype *map, const char *key) \
{ \
return (valtype*)digestmap_get((digestmap_t*)map, key); \
} \
static INLINE valtype* prefix##set(maptype *map, const char *key, \
valtype *val) \
ATTR_UNUSED static INLINE valtype* \
prefix##set(maptype *map, const char *key, valtype *val) \
{ \
return (valtype*)digestmap_set((digestmap_t*)map, key, val); \
} \
static INLINE valtype* prefix##remove(maptype *map, const char *key) \
ATTR_UNUSED static INLINE valtype* \
prefix##remove(maptype *map, const char *key) \
{ \
return (valtype*)digestmap_remove((digestmap_t*)map, key); \
} \
static INLINE void prefix##free(maptype *map, void (*free_val)(void*)) \
ATTR_UNUSED static INLINE void \
prefix##free(maptype *map, void (*free_val)(void*)) \
{ \
digestmap_free((digestmap_t*)map, free_val); \
} \
static INLINE int prefix##isempty(maptype *map) \
ATTR_UNUSED static INLINE int \
prefix##isempty(maptype *map) \
{ \
return digestmap_isempty((digestmap_t*)map); \
} \
static INLINE int prefix##size(maptype *map) \
ATTR_UNUSED static INLINE int \
prefix##size(maptype *map) \
{ \
return digestmap_size((digestmap_t*)map); \
} \
static INLINE prefix##iter_t *prefix##iter_init(maptype *map) \
ATTR_UNUSED static INLINE \
prefix##iter_t *prefix##iter_init(maptype *map) \
{ \
return (prefix##iter_t*) digestmap_iter_init((digestmap_t*)map); \
} \
static INLINE prefix##iter_t *prefix##iter_next(maptype *map, \
prefix##iter_t *iter) \
ATTR_UNUSED static INLINE \
prefix##iter_t *prefix##iter_next(maptype *map, prefix##iter_t *iter) \
{ \
return (prefix##iter_t*) digestmap_iter_next( \
(digestmap_t*)map, (digestmap_iter_t*)iter); \
} \
static INLINE prefix##iter_t *prefix##iter_next_rmv(maptype *map, \
prefix##iter_t *iter) \
ATTR_UNUSED static INLINE prefix##iter_t* \
prefix##iter_next_rmv(maptype *map, prefix##iter_t *iter) \
{ \
return (prefix##iter_t*) digestmap_iter_next_rmv( \
(digestmap_t*)map, (digestmap_iter_t*)iter); \
} \
static INLINE void prefix##iter_get(prefix##iter_t *iter, \
const char **keyp, \
valtype **valp) \
ATTR_UNUSED static INLINE void \
prefix##iter_get(prefix##iter_t *iter, \
const char **keyp, \
valtype **valp) \
{ \
void *v; \
digestmap_iter_get((digestmap_iter_t*) iter, keyp, &v); \
*valp = v; \
} \
static INLINE int prefix##iter_done(prefix##iter_t *iter) \
ATTR_UNUSED static INLINE int \
prefix##iter_done(prefix##iter_t *iter) \
{ \
return digestmap_iter_done((digestmap_iter_t*)iter); \
}