aboutsummaryrefslogtreecommitdiffstats
path: root/src/io.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2012-02-19 03:04:39 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2012-02-19 03:08:16 +0100
commit2702a61b0e22ddcbd0b23c1765fac90fe766802a (patch)
treecb10887ccd29796673fc08bf8066c803add195a8 /src/io.c
parent136e5bc4f7095aef80e55c5e329de5e04bd85886 (diff)
downloadcalcurse-2702a61b0e22ddcbd0b23c1765fac90fe766802a.tar.gz
calcurse-2702a61b0e22ddcbd0b23c1765fac90fe766802a.zip
Fix hash table issues with ISO C99
ISO C99 forbids unnamed structs/unions and nested functions. Move the "HTABLE_HEAD" and "HTABLE_GENERATE" parts out of the function body and place them at the very top of the file (where function definitions are allowed). Also, remove the unnamed struct from "htable.h" (which was useless anyway). Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/io.c')
-rw-r--r--src/io.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/io.c b/src/io.c
index fde4fb9..418feea 100644
--- a/src/io.c
+++ b/src/io.c
@@ -72,6 +72,15 @@ struct ht_keybindings_s {
HTABLE_ENTRY (ht_keybindings_s);
};
+static void load_keys_ht_getkey (struct ht_keybindings_s *, char **, int *);
+static int load_keys_ht_compare (struct ht_keybindings_s *,
+ struct ht_keybindings_s *);
+
+#define HSIZE 256
+HTABLE_HEAD (ht_keybindings, HSIZE, ht_keybindings_s);
+HTABLE_GENERATE (ht_keybindings, ht_keybindings_s, load_keys_ht_getkey,
+ load_keys_ht_compare)
+
/* Draw a progress bar while saving, loading or exporting data. */
static void
progress_bar (progress_bar_t type, int progress)
@@ -752,12 +761,7 @@ io_load_keys (char *pager)
keys_init ();
-#define HSIZE 256
- HTABLE_HEAD (ht_keybindings, HSIZE, ht_keybindings_s) ht_keys =
- HTABLE_INITIALIZER (&ht_keys);
-
- HTABLE_GENERATE (ht_keybindings, ht_keybindings_s, load_keys_ht_getkey,
- load_keys_ht_compare);
+ struct ht_keybindings ht_keys = HTABLE_INITIALIZER (&ht_keys);
for (i = 0; i < NBKEYS; i++)
{
@@ -874,7 +878,6 @@ io_load_keys (char *pager)
keys_fill_missing ();
if (keys_check_missing_bindings ())
WARN_MSG (_("Some actions do not have any associated key bindings!"));
-#undef HSIZE
}
void