Sync OpenBSD patchset 424:

%zu not %u, doh.
This commit is contained in:
Tiago Cunha 2009-10-23 17:21:34 +00:00
parent fce889235c
commit 21b23f8e54
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $Id: input.c,v 1.98 2009-10-23 17:16:24 tcunha Exp $ */ /* $Id: input.c,v 1.99 2009-10-23 17:21:34 tcunha Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -590,7 +590,7 @@ input_handle_character(u_char ch, struct input_ctx *ictx)
if (ch > 0x7f && options_get_number(&wp->window->options, "utf8")) { if (ch > 0x7f && options_get_number(&wp->window->options, "utf8")) {
if (utf8_open(&ictx->utf8data, ch)) { if (utf8_open(&ictx->utf8data, ch)) {
log_debug2("-- utf8 size %u: %zu: %hhu (%c)", log_debug2("-- utf8 size %zu: %zu: %hhu (%c)",
ictx->utf8data.size, ictx->off, ch, ch); ictx->utf8data.size, ictx->off, ch, ch);
input_state(ictx, input_state_utf8); input_state(ictx, input_state_utf8);
return; return;

4
utf8.c
View File

@ -1,4 +1,4 @@
/* $Id: utf8.c,v 1.10 2009-10-23 17:16:25 tcunha Exp $ */ /* $Id: utf8.c,v 1.11 2009-10-23 17:21:34 tcunha Exp $ */
/* /*
* Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
@ -227,7 +227,7 @@ utf8_open(struct utf8_data *utf8data, u_char ch)
/* /*
* Append character to UTF-8, closing if finished. * Append character to UTF-8, closing if finished.
* *
* Returns 1 if more UTF-8 data to come, 1 if finished. * Returns 1 if more UTF-8 data to come, 0 if finished.
*/ */
int int
utf8_append(struct utf8_data *utf8data, u_char ch) utf8_append(struct utf8_data *utf8data, u_char ch)