===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/audioctl/audioctl.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/audioctl/audioctl.c	2020/02/01 18:07:49	1.40
--- src/usr.bin/audioctl/audioctl.c	2020/02/02 05:21:15	1.41
***************
*** 1,4 ****
! /*	$OpenBSD: audioctl.c,v 1.40 2020/02/01 18:07:49 ratchov Exp $	*/
  /*
   * Copyright (c) 2016 Alexandre Ratchov <alex@caoua.org>
   *
--- 1,4 ----
! /*	$OpenBSD: audioctl.c,v 1.41 2020/02/02 05:21:15 ratchov Exp $	*/
  /*
   * Copyright (c) 2016 Alexandre Ratchov <alex@caoua.org>
   *
***************
*** 138,144 ****
  }
  
  void
! print_val(struct field *p, void *addr)
  {
  	int mode;
  	struct audio_swpar *ap;
--- 138,144 ----
  }
  
  void
! print_field(struct field *p, void *addr)
  {
  	int mode;
  	struct audio_swpar *ap;
***************
*** 175,181 ****
  }
  
  void
! parse_val(struct field *f, void *addr, char *p)
  {
  	const char *strerr;
  
--- 175,181 ----
  }
  
  void
! parse_field(struct field *f, void *addr, char *p)
  {
  	const char *strerr;
  
***************
*** 209,215 ****
  	if (argc == 0) {
  		for (f = fields; f->name != NULL; f++) {
  			printf("%s=", f->name);
! 			print_val(f, f->raddr);
  			printf("\n");
  		}
  	}
--- 209,215 ----
  	if (argc == 0) {
  		for (f = fields; f->name != NULL; f++) {
  			printf("%s=", f->name);
! 			print_field(f, f->raddr);
  			printf("\n");
  		}
  	}
***************
*** 228,240 ****
  		if (rhs) {
  			if (f->waddr == NULL)
  				errx(1, "%s: is read only", f->name);
! 			parse_val(f, f->waddr, rhs);
  			f->set = 1;
  			set = 1;
  		} else {
  			if (show_names)
  				printf("%s=", f->name);
! 			print_val(f, f->raddr);
  			printf("\n");
  		}
  	}
--- 228,240 ----
  		if (rhs) {
  			if (f->waddr == NULL)
  				errx(1, "%s: is read only", f->name);
! 			parse_field(f, f->waddr, rhs);
  			f->set = 1;
  			set = 1;
  		} else {
  			if (show_names)
  				printf("%s=", f->name);
! 			print_field(f, f->raddr);
  			printf("\n");
  		}
  	}
***************
*** 249,258 ****
  			continue;
  		if (show_names) {
  			printf("%s: ", f->name);
! 			print_val(f, f->raddr);
  			printf(" -> ");
  		}
! 		print_val(f, f->waddr);
  		printf("\n");
  	}
  }
--- 249,258 ----
  			continue;
  		if (show_names) {
  			printf("%s: ", f->name);
! 			print_field(f, f->raddr);
  			printf(" -> ");
  		}
! 		print_field(f, f->waddr);
  		printf("\n");
  	}
  }