diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-04 13:58:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-10-04 13:58:41 +0200 |
| commit | e40cb595a2da943483124fae8f215a397add9fca (patch) | |
| tree | 9958d817c3d648e0d6bb0aafd12485afa9aac49e /runtime | |
| parent | d5f16404f93d54afddebb9fb683469fc712d2335 (diff) | |
| download | rsyslog-e40cb595a2da943483124fae8f215a397add9fca.tar.gz rsyslog-e40cb595a2da943483124fae8f215a397add9fca.tar.xz rsyslog-e40cb595a2da943483124fae8f215a397add9fca.zip | |
omhdfs: support for HUP added
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 6 | ||||
| -rw-r--r-- | runtime/hashtable.c (renamed from runtime/hashtable/hashtable.c) | 0 | ||||
| -rw-r--r-- | runtime/hashtable_itr.c (renamed from runtime/hashtable/hashtable_itr.c) | 2 | ||||
| -rw-r--r-- | runtime/hashtable_itr.h (renamed from runtime/hashtable/hashtable_itr.h) | 4 | ||||
| -rw-r--r-- | runtime/hashtable_private.h (renamed from runtime/hashtable/hashtable_private.h) | 0 |
5 files changed, 8 insertions, 4 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 5a0c4437..93817e75 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -95,9 +95,11 @@ librsyslog_la_SOURCES = \ ../parse.c \ ../parse.h \ \ - hashtable/hashtable.c \ + hashtable.c \ hashtable.h \ - hashtable/hashtable_private.h \ + hashtable_itr.c \ + hashtable_itr.h \ + hashtable_private.h \ \ ../outchannel.c \ ../outchannel.h \ diff --git a/runtime/hashtable/hashtable.c b/runtime/hashtable.c index 41fc60fe..41fc60fe 100644 --- a/runtime/hashtable/hashtable.c +++ b/runtime/hashtable.c diff --git a/runtime/hashtable/hashtable_itr.c b/runtime/hashtable_itr.c index 5dced841..967287f1 100644 --- a/runtime/hashtable/hashtable_itr.c +++ b/runtime/hashtable_itr.c @@ -38,6 +38,7 @@ hashtable_iterator(struct hashtable *h) /* key - return the key of the (key,value) pair at the current position */ /* value - return the value of the (key,value) pair at the current position */ +#if 0 /* these are now inline functions! */ void * hashtable_iterator_key(struct hashtable_itr *i) { return i->e->k; } @@ -45,6 +46,7 @@ hashtable_iterator_key(struct hashtable_itr *i) void * hashtable_iterator_value(struct hashtable_itr *i) { return i->e->v; } +#endif /*****************************************************************************/ /* advance - advance the iterator to the next element diff --git a/runtime/hashtable/hashtable_itr.h b/runtime/hashtable_itr.h index eea699a7..1c206b6e 100644 --- a/runtime/hashtable/hashtable_itr.h +++ b/runtime/hashtable_itr.h @@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h); /* hashtable_iterator_key * - return the value of the (key,value) pair at the current position */ -extern inline void * +static inline void * hashtable_iterator_key(struct hashtable_itr *i) { return i->e->k; @@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_itr *i) /*****************************************************************************/ /* value - return the value of the (key,value) pair at the current position */ -extern inline void * +static inline void * hashtable_iterator_value(struct hashtable_itr *i) { return i->e->v; diff --git a/runtime/hashtable/hashtable_private.h b/runtime/hashtable_private.h index 10b82da4..10b82da4 100644 --- a/runtime/hashtable/hashtable_private.h +++ b/runtime/hashtable_private.h |