Refactor

7 files changed, 18 insertions, 19 deletions

diff --git a/src/blocks/date.c b/src/blocks/date.c
index c9ffb55..1cb9da9 100644
--- a/src/blocks/date.c
+++ b/src/blocks/date.c
@@ -31,10 +31,10 @@ static void block_date_update(block_t *block)
     assert(date->block.text != NULL);
 }
 
-static void block_date_init(block_t *block, const block_scheme_t *scheme)
+static void block_date_init(block_t *block)
 {
     extern const block_scheme_t block_text_scheme;
-    block_text_scheme.init_fn(block, scheme);
+    block_text_scheme.init_fn(block);
     block->update_interval = block_date_interval;
     block->update_fn = block_date_update;
 }
@@ -46,7 +46,7 @@ static void block_date_clean(block_t *block)
     free(date->block.text);
 }
 
-static int block_date_validate(block_t *block, const block_scheme_t *scheme)
+static int block_date_validate(block_t *block)
 {
     block_date_t *date = (block_date_t *)block;
     int errors = 0;
@@ -56,8 +56,7 @@ static int block_date_validate(block_t *block, const block_scheme_t *scheme)
         errors++;
     }
 
-    date->format = date->block.text;
-    date->block.text = strcopy("?");
+    date->format = strcopy(date->block.text);
     return errors;
 }
 
diff --git a/src/blocks/fs.c b/src/blocks/fs.c
index 39b669a..688956d 100644
--- a/src/blocks/fs.c
+++ b/src/blocks/fs.c
@@ -119,10 +119,10 @@ static void block_fs_update(block_t *block)
     assert(fs->block.text != NULL);
 }
 
-static void block_fs_init(block_t *block, const block_scheme_t *scheme)
+static void block_fs_init(block_t *block)
 {
     extern const block_scheme_t block_text_scheme;
-    block_text_scheme.init_fn(block, scheme);
+    block_text_scheme.init_fn(block);
     block->update_interval = block_fs_interval;
     block->update_fn = block_fs_update;
 }
@@ -135,7 +135,7 @@ static void block_fs_clean(block_t *block)
     free(fs->block.text);
 }
 
-static int block_fs_validate(block_t *block, const block_scheme_t *scheme)
+static int block_fs_validate(block_t *block)
 {
     block_fs_t *fs = (block_fs_t *)block;
     int errors = 0;
diff --git a/src/blocks/group.c b/src/blocks/group.c
index d56ed9a..febefe4 100644
--- a/src/blocks/group.c
+++ b/src/blocks/group.c
@@ -1,6 +1,6 @@
 #include "../block.h"
 
-static void block_group_init(block_t *block, const block_scheme_t *scheme)
+static void block_group_init(block_t *block)
 {
     block->type = BLOCK_GROUP;
 }
diff --git a/src/blocks/ram.c b/src/blocks/ram.c
index ed7465f..2aae5ac 100644
--- a/src/blocks/ram.c
+++ b/src/blocks/ram.c
@@ -128,10 +128,10 @@ static void block_ram_update(block_t *block)
     assert(ram->block.text != NULL);
 }
 
-static void block_ram_init(block_t *block, const block_scheme_t *scheme)
+static void block_ram_init(block_t *block)
 {
     extern const block_scheme_t block_text_scheme;
-    block_text_scheme.init_fn(block, scheme);
+    block_text_scheme.init_fn(block);
     block->update_interval = block_ram_interval;
     block->update_fn = block_ram_update;
 }
@@ -143,7 +143,7 @@ static void block_ram_clean(block_t *block)
     free(ram->block.text);
 }
 
-static int block_ram_validate(block_t *block, const block_scheme_t *scheme)
+static int block_ram_validate(block_t *block)
 {
     block_ram_t *ram = (block_ram_t *)block;
     int errors = 0;
diff --git a/src/blocks/script.c b/src/blocks/script.c
index 51e5328..bcbb1b2 100644
--- a/src/blocks/script.c
+++ b/src/blocks/script.c
@@ -43,10 +43,10 @@ static void block_script_update(block_t *block)
     assert(script->block.text != NULL);
 }
 
-static void block_script_init(block_t *block, const block_scheme_t *scheme)
+static void block_script_init(block_t *block)
 {
     extern const block_scheme_t block_text_scheme;
-    block_text_scheme.init_fn(block, scheme);
+    block_text_scheme.init_fn(block);
     block->update_interval = block_script_interval;
     block->update_fn = block_script_update;
 }
@@ -58,7 +58,7 @@ static void block_script_clean(block_t *block)
     free(script->block.text);
 }
 
-static int block_script_validate(block_t *block, const block_scheme_t *scheme)
+static int block_script_validate(block_t *block)
 {
     block_script_t *script = (block_script_t *)block;
     int errors = 0;
diff --git a/src/blocks/slider.c b/src/blocks/slider.c
index 228dec2..7050faf 100644
--- a/src/blocks/slider.c
+++ b/src/blocks/slider.c
@@ -197,7 +197,7 @@ static void block_slider_event(layout_t *layout, event_t event)
                     "i:new_value", slider->value);
 }
 
-static void block_slider_init(block_t *block, const block_scheme_t *scheme)
+static void block_slider_init(block_t *block)
 {
     block->type = BLOCK_SPEC;
     block_slider_t *slider  = (block_slider_t *)block;
@@ -216,7 +216,7 @@ static void block_slider_clean(block_t *block)
     gradient_free(&slider->knob_line_color);
 }
 
-static int block_slider_validate(block_t *block, const block_scheme_t *scheme)
+static int block_slider_validate(block_t *block)
 {
     block_slider_t *slider = (block_slider_t *)block;
     int errors = 0;
diff --git a/src/blocks/text.c b/src/blocks/text.c
index 3eba8f4..be4c398 100644
--- a/src/blocks/text.c
+++ b/src/blocks/text.c
@@ -2,7 +2,7 @@
 
 #include "../any_log.h"
 
-static void block_text_init(block_t *block, const block_scheme_t *scheme)
+static void block_text_init(block_t *block)
 {
     block->type = BLOCK_TEXT;
 }
@@ -13,7 +13,7 @@ static void block_text_clean(block_t *block)
     free(text->text);
 }
 
-static int block_text_validate(block_t *block, const block_scheme_t *scheme)
+static int block_text_validate(block_t *block)
 {
     block_text_t *text = (block_text_t *)block;
     int errors = 0;