From 5559e7f6cb8e9e5bdc54677704db5abcf84306ee Mon Sep 17 00:00:00 2001 From: volker Date: Wed, 13 Feb 2013 13:49:22 +0000 Subject: stabilize text widget when no string is available; info message when serdisplib cannot open port git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@1192 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- drv_serdisplib.c | 1 + svn_version.h | 2 +- widget_text.c | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drv_serdisplib.c b/drv_serdisplib.c index d4b5542..d6fe4b0 100644 --- a/drv_serdisplib.c +++ b/drv_serdisplib.c @@ -164,6 +164,7 @@ static int drv_SD_start(const char *section) sdcd = SDCONN_open(port); if (sdcd == NULL) { error("%s: open(%s) failed: %s", Name, port, sd_geterrormsg()); + info("%s: examples:\n serraw:/dev/ttyS0\n par:/dev/parport0\n USB:/", Name); return -1; } diff --git a/svn_version.h b/svn_version.h index 9d24f76..5df47cf 100644 --- a/svn_version.h +++ b/svn_version.h @@ -1 +1 @@ -#define SVN_VERSION "1158" +#define SVN_VERSION "1192" diff --git a/widget_text.c b/widget_text.c index 7c1ee7a..ee178e6 100644 --- a/widget_text.c +++ b/widget_text.c @@ -58,6 +58,10 @@ void widget_text_scroll(void *Self) { WIDGET *W = (WIDGET *) Self; + if (NULL == W || NULL == W->data) { + error("Warning: internal data error in Textwidget"); + return; + } WIDGET_TEXT *T = W->data; char *prefix = P2S(&T->prefix); @@ -68,6 +72,10 @@ void widget_text_scroll(void *Self) int num, len, width, pad; char *src, *dst; + if (NULL == string) { + error("Warning: Widget %s has no string", W->name); + return; + } num = 0; len = strlen(string); width = T->width - strlen(prefix) - strlen(postfix); -- cgit v1.2.3