aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-09-13 05:33:39 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2006-09-13 05:33:39 +0000
commit663f8445f1120cbb21653da3956f0e35be881ebe (patch)
tree990ec97345b605e9b7fb50553680c6879beb41c8
parent55c3aae4044ca2115ba12194faa4e834e7899909 (diff)
downloadlcd4linux-663f8445f1120cbb21653da3956f0e35be881ebe.tar.gz
[lcd4linux @ 2006-09-13 05:33:39 by reinelt]
plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@710 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
-rw-r--r--plugin_file.c6
-rw-r--r--widget_text.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/plugin_file.c b/plugin_file.c
index 368eec9..2fc9ea0 100644
--- a/plugin_file.c
+++ b/plugin_file.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_file.c,v 1.2 2006/07/19 01:57:01 cmay Exp $
+/* $Id: plugin_file.c,v 1.3 2006/09/13 05:33:39 reinelt Exp $
*
* plugin to perform simple file operations
*
@@ -23,6 +23,9 @@
*
*
* $Log: plugin_file.c,v $
+ * Revision 1.3 2006/09/13 05:33:39 reinelt
+ * plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated)
+ *
* Revision 1.2 2006/07/19 01:57:01 cmay
* fixed double read of last line in file
*
@@ -70,6 +73,7 @@ static void my_readline(RESULT * result, RESULT * arg1, RESULT * arg2)
fp = fopen(R2S(arg1), "r");
if (!fp) {
error("readline couldn't open file '%s'", R2S(arg1));
+ value[0] = '\0';
} else {
i = 0;
while (!feof(fp) && i++ < reqline) {
diff --git a/widget_text.c b/widget_text.c
index d543534..3b4f52e 100644
--- a/widget_text.c
+++ b/widget_text.c
@@ -1,4 +1,4 @@
-/* $Id: widget_text.c,v 1.27 2006/08/13 18:14:03 harbaum Exp $
+/* $Id: widget_text.c,v 1.28 2006/09/13 05:33:39 reinelt Exp $
*
* simple text widget handling
*
@@ -21,6 +21,9 @@
*
*
* $Log: widget_text.c,v $
+ * Revision 1.28 2006/09/13 05:33:39 reinelt
+ * plugin_file: return empty string if file cannot be read; widget_text: load property as 'string', not as variable (triggered an ugly bug with variable list reallocated)
+ *
* Revision 1.27 2006/08/13 18:14:03 harbaum
* Added KVV plugin
*
@@ -363,7 +366,7 @@ int widget_text_init(WIDGET * Self)
property_load(section, "prefix", NULL, &Text->prefix);
property_load(section, "expression", NULL, &Text->value);
property_load(section, "postfix", NULL, &Text->postfix);
- property_load(section, "style", "norm", &Text->style);
+ property_load(section, "style", "'norm'", &Text->style);
/* field width, default 10 */
cfg_number(section, "width", 10, 0, -1, &(Text->width));