===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -c -r1.70 -r1.71
*** src/usr.bin/tmux/screen-write.c	2014/10/02 08:36:26	1.70
--- src/usr.bin/tmux/screen-write.c	2014/10/20 23:57:14	1.71
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.70 2014/10/02 08:36:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.71 2014/10/20 23:57:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 25,37 ****
  
  void	screen_write_initctx(struct screen_write_ctx *, struct tty_ctx *, int);
  void	screen_write_overwrite(struct screen_write_ctx *, u_int);
! int	screen_write_combine(
! 	    struct screen_write_ctx *, const struct utf8_data *);
  
  /* Initialise writing with a window. */
  void
! screen_write_start(
!     struct screen_write_ctx *ctx, struct window_pane *wp, struct screen *s)
  {
  	ctx->wp = wp;
  	if (wp != NULL && s == NULL)
--- 25,37 ----
  
  void	screen_write_initctx(struct screen_write_ctx *, struct tty_ctx *, int);
  void	screen_write_overwrite(struct screen_write_ctx *, u_int);
! int	screen_write_combine(struct screen_write_ctx *,
! 	    const struct utf8_data *);
  
  /* Initialise writing with a window. */
  void
! screen_write_start(struct screen_write_ctx *ctx, struct window_pane *wp,
!     struct screen *s)
  {
  	ctx->wp = wp;
  	if (wp != NULL && s == NULL)
***************
*** 73,79 ****
  }
  
  /* Calculate string length, with embedded formatting. */
! size_t printflike2
  screen_write_cstrlen(int utf8flag, const char *fmt, ...)
  {
  	va_list	ap;
--- 73,79 ----
  }
  
  /* Calculate string length, with embedded formatting. */
! size_t
  screen_write_cstrlen(int utf8flag, const char *fmt, ...)
  {
  	va_list	ap;
***************
*** 108,114 ****
  }
  
  /* Calculate string length. */
! size_t printflike2
  screen_write_strlen(int utf8flag, const char *fmt, ...)
  {
  	va_list			ap;
--- 108,114 ----
  }
  
  /* Calculate string length. */
! size_t
  screen_write_strlen(int utf8flag, const char *fmt, ...)
  {
  	va_list			ap;
***************
*** 145,153 ****
  }
  
  /* Write simple string (no UTF-8 or maximum length). */
! void printflike3
! screen_write_puts(
!     struct screen_write_ctx *ctx, struct grid_cell *gc, const char *fmt, ...)
  {
  	va_list	ap;
  
--- 145,153 ----
  }
  
  /* Write simple string (no UTF-8 or maximum length). */
! void
! screen_write_puts(struct screen_write_ctx *ctx, struct grid_cell *gc,
!     const char *fmt, ...)
  {
  	va_list	ap;
  
***************
*** 157,165 ****
  }
  
  /* Write string with length limit (-1 for unlimited). */
! void printflike5
! screen_write_nputs(struct screen_write_ctx *ctx,
!     ssize_t maxlen, struct grid_cell *gc, int utf8flag, const char *fmt, ...)
  {
  	va_list	ap;
  
--- 157,165 ----
  }
  
  /* Write string with length limit (-1 for unlimited). */
! void
! screen_write_nputs(struct screen_write_ctx *ctx, ssize_t maxlen,
!     struct grid_cell *gc, int utf8flag, const char *fmt, ...)
  {
  	va_list	ap;
  
***************
*** 221,227 ****
  }
  
  /* Write string, similar to nputs, but with embedded formatting (#[]). */
! void printflike5
  screen_write_cnputs(struct screen_write_ctx *ctx,
      ssize_t maxlen, struct grid_cell *gc, int utf8flag, const char *fmt, ...)
  {
--- 221,227 ----
  }
  
  /* Write string, similar to nputs, but with embedded formatting (#[]). */
! void
  screen_write_cnputs(struct screen_write_ctx *ctx,
      ssize_t maxlen, struct grid_cell *gc, int utf8flag, const char *fmt, ...)
  {