summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-10-27 19:38:51 +0200
committerErich Eckner <git@eckner.net>2018-10-27 19:38:51 +0200
commit4b87c3122ca0a4d6dfcedbf9a71f7d2abbd98ccd (patch)
tree6931870471e704f2465bbd986267fe7ed73ba7a7
parentf960a6d5c824c795195f82483b53dd2fda6a968a (diff)
downloadanzeige-4b87c3122ca0a4d6dfcedbf9a71f7d2abbd98ccd.tar.xz
Nachrichten mit ";" trennen
-rw-r--r--anzeige.c6
-rw-r--r--input_gadgets.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/anzeige.c b/anzeige.c
index 42453a3..279eeac 100644
--- a/anzeige.c
+++ b/anzeige.c
@@ -78,14 +78,16 @@ int main(int argc, char **argv)
free(text_buffer);
return EXIT_FAILURE;
}
-
+ if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0)
+ text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; ");
text_buffer_end = gadgets_retrieve_current_temperature(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end);
if (text_buffer_end == NULL) {
fprintf(stderr, "gadgets_retrieve_current_temperature failed\n");
free(text_buffer);
return EXIT_FAILURE;
}
-
+ if (text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end > 0)
+ text_buffer_end += snprintf(text_buffer_end, text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end, "; ");
text_buffer_end = gadgets_retrieve_weather_forecast(text_buffer_end,text_buffer + TEXT_BUFFER_LENGTH - text_buffer_end);
if (text_buffer_end == NULL) {
fprintf(stderr, "gadgets_retrieve_weather_forecast failed\n");
diff --git a/input_gadgets.c b/input_gadgets.c
index fe754da..9076278 100644
--- a/input_gadgets.c
+++ b/input_gadgets.c
@@ -746,7 +746,7 @@ char *gadgets_retrieve_weather_warnings(char *output, int max_len)
if (output + max_len - ende > 0) {
ende += snprintf(ende, output + max_len - ende, "%s", warnings[i].event);
if ((i+1<warnings_len) && (output + max_len - ende > 0))
- ende += snprintf(ende, output + max_len - ende, ", ", warnings[i].event);
+ ende += snprintf(ende, output + max_len - ende, "; ", warnings[i].event);
}
free(warnings[i].headline);