diff options
| author | Mattias Andrée <maandree@operamail.com> | 2015-08-22 00:38:50 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2015-08-22 00:38:50 +0200 |
| commit | ed937dd3058b10e0ec5fdcffd93dc2c2a7f2c2da (patch) | |
| tree | 31155457a0f27e05acdf70682caeeb86cc5769c2 | |
| parent | add and use xclose and xfclose, we do not want close or fclose to be ignored because a singal interrupts it. (diff) | |
| download | mds-ed937dd3058b10e0ec5fdcffd93dc2c2a7f2c2da.tar.gz mds-ed937dd3058b10e0ec5fdcffd93dc2c2a7f2c2da.tar.bz2 mds-ed937dd3058b10e0ec5fdcffd93dc2c2a7f2c2da.tar.xz | |
typo + mds-colour: print colour list on SIGINFO
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/libmdsserver/hash-list.h | 2 | ||||
| -rw-r--r-- | src/mds-colour.c | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/libmdsserver/hash-list.h b/src/libmdsserver/hash-list.h index dfc4489..fcd9eb4 100644 --- a/src/libmdsserver/hash-list.h +++ b/src/libmdsserver/hash-list.h @@ -507,7 +507,7 @@ T##_unmarshal(T##_t* restrict this, char* restrict data)\ */ #define foreach_hash_list_entry(this, i, entry) \ for (i = 0; i < (this).used; i++) \ - if (entry = (this).slots, entry->keys != NULL) + if (entry = (this).slots, entry->key != NULL) #endif diff --git a/src/mds-colour.c b/src/mds-colour.c index 2bee831..c5151dc 100644 --- a/src/mds-colour.c +++ b/src/mds-colour.c @@ -477,10 +477,18 @@ int handle_set_colour(const char* recv_name, const char* recv_remove, const char */ void received_info(int signo) { + size_t i; + colour_list_entry_t* entry; (void) signo; iprintf("next message ID: %" PRIu32, message_id); iprintf("connected: %s", connected ? "yes" : "no"); iprintf("send buffer size: %zu bytes", send_buffer_size); + iprint("DEFINED COLOURS (bytes red green blue name-hash name)"); + foreach_hash_list_entry (colours, i, entry) + iprintf("%i %"PRIu64" %"PRIu64" %"PRIu64" %zu %s", + entry->value.bytes, entry->value.red, entry->value.green, + entry->value.blue, entry->key_hash, entry->key); + iprint("END DEFINED COLOURS"); } |