===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/sndiod/sock.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/sndiod/sock.c	2015/12/07 11:58:29	1.16
--- src/usr.bin/sndiod/sock.c	2016/01/08 16:17:31	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: sock.c,v 1.16 2015/12/07 11:58:29 ratchov Exp $	*/
  /*
   * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
   *
--- 1,4 ----
! /*	$OpenBSD: sock.c,v 1.17 2016/01/08 16:17:31 ratchov Exp $	*/
  /*
   * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
   *
***************
*** 337,343 ****
  			}
  			sock_close(f);
  		} else {
! #ifdef DEBUG			
  			if (log_level >= 4) {
  				sock_log(f);
  				log_puts(": write blocked\n");
--- 337,343 ----
  			}
  			sock_close(f);
  		} else {
! #ifdef DEBUG
  			if (log_level >= 4) {
  				sock_log(f);
  				log_puts(": write blocked\n");
***************
*** 378,384 ****
  			}
  			sock_close(f);
  		} else {
! #ifdef DEBUG			
  			if (log_level >= 4) {
  				sock_log(f);
  				log_puts(": read blocked\n");
--- 378,384 ----
  			}
  			sock_close(f);
  		} else {
! #ifdef DEBUG
  			if (log_level >= 4) {
  				sock_log(f);
  				log_puts(": read blocked\n");
***************
*** 1096,1102 ****
  				f->ralign = s->round * s->mix.bpf;
  			}
  		}
! 		slot_stop(s);		
  		break;
  	case AMSG_SETPAR:
  #ifdef DEBUG
--- 1096,1102 ----
  				f->ralign = s->round * s->mix.bpf;
  			}
  		}
! 		slot_stop(s);
  		break;
  	case AMSG_SETPAR:
  #ifdef DEBUG
***************
*** 1284,1290 ****
  int
  sock_buildmsg(struct sock *f)
  {
! 	unsigned int size;	
  
  	/*
  	 * If pos changed (or initial tick), build a MOVE message.
--- 1284,1290 ----
  int
  sock_buildmsg(struct sock *f)
  {
! 	unsigned int size;
  
  	/*
  	 * If pos changed (or initial tick), build a MOVE message.
***************
*** 1314,1320 ****
  
  	if (f->fillpending > 0) {
  		AMSG_INIT(&f->wmsg);
! 		f->wmsg.cmd = htonl(AMSG_FLOWCTL);	       
  		f->wmsg.u.ts.delta = htonl(f->fillpending);
  		size = f->fillpending;
  		if (f->slot)
--- 1314,1320 ----
  
  	if (f->fillpending > 0) {
  		AMSG_INIT(&f->wmsg);
! 		f->wmsg.cmd = htonl(AMSG_FLOWCTL);
  		f->wmsg.u.ts.delta = htonl(f->fillpending);
  		size = f->fillpending;
  		if (f->slot)
***************
*** 1358,1364 ****
  	}
  
  	if (f->midi != NULL && f->midi->obuf.used > 0) {
! 		size = f->midi->obuf.used;		
  		if (size > AMSG_DATAMAX)
  			size = AMSG_DATAMAX;
  		AMSG_INIT(&f->wmsg);
--- 1358,1364 ----
  	}
  
  	if (f->midi != NULL && f->midi->obuf.used > 0) {
! 		size = f->midi->obuf.used;
  		if (size > AMSG_DATAMAX)
  			size = AMSG_DATAMAX;
  		AMSG_INIT(&f->wmsg);