diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-12 12:01:17 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-12 12:01:17 +0000 |
| commit | 5f483499f3a7b98da9ac67cd62ed91034a5949ed (patch) | |
| tree | de84187f104010233d96acc68bb9cc91d173c243 /paste.c | |
| parent | 333da3b64b4ce8c0343f082c3923473205ab2b27 (diff) | |
| parent | 0cc812ae342d1a71c0337db8ffb4d7701668cb38 (diff) | |
| download | rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.tar.gz rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.tar.bz2 rtmux-5f483499f3a7b98da9ac67cd62ed91034a5949ed.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'paste.c')
| -rw-r--r-- | paste.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -274,7 +274,7 @@ paste_set(char *data, size_t size, const char *name, char **cause) /* Convert start of buffer into a nice string. */ char * -paste_make_sample(struct paste_buffer *pb, int utf8flag) +paste_make_sample(struct paste_buffer *pb) { char *buf; size_t len, used; @@ -286,10 +286,7 @@ paste_make_sample(struct paste_buffer *pb, int utf8flag) len = width; buf = xreallocarray(NULL, len, 4 + 4); - if (utf8flag) - used = utf8_strvis(buf, pb->data, len, flags); - else - used = strvisx(buf, pb->data, len, flags); + used = utf8_strvis(buf, pb->data, len, flags); if (pb->size > width || used > width) strlcpy(buf + width, "...", 4); return (buf); |