summaryrefslogtreecommitdiff
path: root/src/libsystemd-terminal/subterm.c
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-10-02 16:36:09 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2014-10-03 15:57:00 +0200
commitf1f5b2a3bdc3178d57c4088a7cd7758afaeba9cb (patch)
treee173b2fadb2df9c814fe9a3185e9fb90be30f64f /src/libsystemd-terminal/subterm.c
parentdb1a606610e5a528903a4380f30c9934a0c5a134 (diff)
terminal: make utf8 decoder return length
Lets return the parsed length in term_utf8_decode() instead of a buffer pointer. Store the pointer in the passed argument. This makes it adhere to the systemd coding-style, were we always avoid returning pointers, but store them in output arguments. In this case, the storage is not allocated, so it doesn't fit 100% to this idiom, but still looks much nicer.
Diffstat (limited to 'src/libsystemd-terminal/subterm.c')
-rw-r--r--src/libsystemd-terminal/subterm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsystemd-terminal/subterm.c b/src/libsystemd-terminal/subterm.c
index 3990fb392b..adc4caa42e 100644
--- a/src/libsystemd-terminal/subterm.c
+++ b/src/libsystemd-terminal/subterm.c
@@ -716,10 +716,10 @@ static int terminal_io_fn(sd_event_source *source, int fd, uint32_t revents, voi
for (i = 0; i < len; ++i) {
const term_seq *seq;
- const uint32_t *str;
+ uint32_t *str;
size_t n_str, j;
- str = term_utf8_decode(&t->utf8, &n_str, buf[i]);
+ n_str = term_utf8_decode(&t->utf8, &str, buf[i]);
for (j = 0; j < n_str; ++j) {
type = term_parser_feed(t->parser, &seq, str[j]);
if (type < 0) {