===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mixerctl/mixerctl.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/mixerctl/mixerctl.c	2005/01/04 18:20:37	1.17
--- src/usr.bin/mixerctl/mixerctl.c	2005/01/04 18:22:09	1.18
***************
*** 1,4 ****
! /*	$OpenBSD: mixerctl.c,v 1.17 2005/01/04 18:20:37 millert Exp $	*/
  /*	$NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: mixerctl.c,v 1.18 2005/01/04 18:22:09 millert Exp $	*/
  /*	$NetBSD: mixerctl.c,v 1.11 1998/04/27 16:55:23 augustss Exp $	*/
  
  /*
***************
*** 87,93 ****
  findfield(char *name)
  {
  	int i;
! 	for(i = 0; fields[i].name; i++)
  		if (strcmp(fields[i].name, name) == 0)
  			return &fields[i];
  	return (0);
--- 87,93 ----
  findfield(char *name)
  {
  	int i;
! 	for (i = 0; fields[i].name; i++)
  		if (strcmp(fields[i].name, name) == 0)
  			return &fields[i];
  	return (0);
***************
*** 104,128 ****
  	m = p->valp;
  	switch(m->type) {
  	case AUDIO_MIXER_ENUM:
! 		for(i = 0; i < p->infp->un.e.num_mem; i++)
  			if (p->infp->un.e.member[i].ord == m->un.ord)
  				fprintf(out, "%s",
  					p->infp->un.e.member[i].label.name);
  		if (prvalset) {
  			fprintf(out, "  [ ");
! 			for(i = 0; i < p->infp->un.e.num_mem; i++)
  				fprintf(out, "%s ", p->infp->un.e.member[i].label.name);
  			fprintf(out, "]");
  		}
  		break;
  	case AUDIO_MIXER_SET:
! 		for(n = i = 0; i < p->infp->un.s.num_mem; i++)
  			if (m->un.mask & p->infp->un.s.member[i].mask)
  				fprintf(out, "%s%s", n++ ? "," : "",
  					p->infp->un.s.member[i].label.name);
  		if (prvalset) {
  			fprintf(out, "  { ");
! 			for(i = 0; i < p->infp->un.s.num_mem; i++)
  				fprintf(out, "%s ", p->infp->un.s.member[i].label.name);
  			fprintf(out, "}");
  		}
--- 104,128 ----
  	m = p->valp;
  	switch(m->type) {
  	case AUDIO_MIXER_ENUM:
! 		for (i = 0; i < p->infp->un.e.num_mem; i++)
  			if (p->infp->un.e.member[i].ord == m->un.ord)
  				fprintf(out, "%s",
  					p->infp->un.e.member[i].label.name);
  		if (prvalset) {
  			fprintf(out, "  [ ");
! 			for (i = 0; i < p->infp->un.e.num_mem; i++)
  				fprintf(out, "%s ", p->infp->un.e.member[i].label.name);
  			fprintf(out, "]");
  		}
  		break;
  	case AUDIO_MIXER_SET:
! 		for (n = i = 0; i < p->infp->un.s.num_mem; i++)
  			if (m->un.mask & p->infp->un.s.member[i].mask)
  				fprintf(out, "%s%s", n++ ? "," : "",
  					p->infp->un.s.member[i].label.name);
  		if (prvalset) {
  			fprintf(out, "  { ");
! 			for (i = 0; i < p->infp->un.s.num_mem; i++)
  				fprintf(out, "%s ", p->infp->un.s.member[i].label.name);
  			fprintf(out, "}");
  		}
***************
*** 152,158 ****
  	m = p->valp;
  	switch(m->type) {
  	case AUDIO_MIXER_ENUM:
! 		for(i = 0; i < p->infp->un.e.num_mem; i++)
  			if (strcmp(p->infp->un.e.member[i].label.name, q) == 0)
  				break;
  		if (i < p->infp->un.e.num_mem)
--- 152,158 ----
  	m = p->valp;
  	switch(m->type) {
  	case AUDIO_MIXER_ENUM:
! 		for (i = 0; i < p->infp->un.e.num_mem; i++)
  			if (strcmp(p->infp->un.e.member[i].label.name, q) == 0)
  				break;
  		if (i < p->infp->un.e.num_mem)
***************
*** 162,168 ****
  		break;
  	case AUDIO_MIXER_SET:
  		mask = 0;
! 		for(v = 0; q && *q; q = s) {
  			if (s = strchr(q, ','))
  				*s++ = 0;
  			for (i = 0; i < p->infp->un.s.num_mem; i++)
--- 162,168 ----
  		break;
  	case AUDIO_MIXER_SET:
  		mask = 0;
! 		for (v = 0; q && *q; q = s) {
  			if (s = strchr(q, ','))
  				*s++ = 0;
  			for (i = 0; i < p->infp->un.s.num_mem; i++)
***************
*** 278,284 ****
  		if ((fd = open(file, O_RDONLY)) == -1)
  			err(1, "%s", file);
  
! 	for(ndev = 0; ; ndev++) {
  		dinfo.index = ndev;
  		if (ioctl(fd, AUDIO_MIXER_DEVINFO, &dinfo) < 0)
  			break;
--- 278,284 ----
  		if ((fd = open(file, O_RDONLY)) == -1)
  			err(1, "%s", file);
  
! 	for (ndev = 0; ; ndev++) {
  		dinfo.index = ndev;
  		if (ioctl(fd, AUDIO_MIXER_DEVINFO, &dinfo) < 0)
  			break;
***************
*** 293,299 ****
  	    (values = calloc(ndev, sizeof *values)) == NULL)
  		err(1, "calloc()");
  
! 	for(i = 0; i < ndev; i++) {
  		infos[i].index = i;
  		if (ioctl(fd, AUDIO_MIXER_DEVINFO, &infos[i]) < 0) {
  			ndev--, i--;
--- 293,299 ----
  	    (values = calloc(ndev, sizeof *values)) == NULL)
  		err(1, "calloc()");
  
! 	for (i = 0; i < ndev; i++) {
  		infos[i].index = i;
  		if (ioctl(fd, AUDIO_MIXER_DEVINFO, &infos[i]) < 0) {
  			ndev--, i--;
***************
*** 301,313 ****
  		}
  	}
  
! 	for(i = 0; i < ndev; i++) {
  		rfields[i].name = infos[i].label.name;
  		rfields[i].valp = &values[i];
  		rfields[i].infp = &infos[i];
  	}
  
! 	for(i = 0; i < ndev; i++) {
  		values[i].dev = i;
  		values[i].type = infos[i].type;
  		if (infos[i].type != AUDIO_MIXER_CLASS) {
--- 301,313 ----
  		}
  	}
  
! 	for (i = 0; i < ndev; i++) {
  		rfields[i].name = infos[i].label.name;
  		rfields[i].valp = &values[i];
  		rfields[i].infp = &infos[i];
  	}
  
! 	for (i = 0; i < ndev; i++) {
  		values[i].dev = i;
  		values[i].type = infos[i].type;
  		if (infos[i].type != AUDIO_MIXER_CLASS) {
***************
*** 320,330 ****
  		}
  	}
  
! 	for(j = i = 0; i < ndev; i++) {
  		if (infos[i].type != AUDIO_MIXER_CLASS &&
  		    infos[i].type != -1) {
  			fields[j++] = rfields[i];
! 			for(pos = infos[i].next; pos != AUDIO_MIXER_LAST;
  			    pos = infos[pos].next) {
  				fields[j] = rfields[pos];
  				fields[j].name = catstr(rfields[i].name,
--- 320,330 ----
  		}
  	}
  
! 	for (j = i = 0; i < ndev; i++) {
  		if (infos[i].type != AUDIO_MIXER_CLASS &&
  		    infos[i].type != -1) {
  			fields[j++] = rfields[i];
! 			for (pos = infos[i].next; pos != AUDIO_MIXER_LAST;
  			    pos = infos[pos].next) {
  				fields[j] = rfields[pos];
  				fields[j].name = catstr(rfields[i].name,
***************
*** 335,341 ****
  		}
  	}
  
! 	for(i = 0; i < j; i++) {
  		int cls = fields[i].infp->mixer_class;
  		if (cls >= 0 && cls < ndev)
  			fields[i].name = catstr(infos[cls].label.name,
--- 335,341 ----
  		}
  	}
  
! 	for (i = 0; i < j; i++) {
  		int cls = fields[i].infp->mixer_class;
  		if (cls >= 0 && cls < ndev)
  			fields[i].name = catstr(infos[cls].label.name,
***************
*** 343,349 ****
  	}
  
  	if (!argc && aflag) {
! 		for(i = 0; fields[i].name; i++) {
  			prfield(&fields[i], sep, vflag);
  			fprintf(out, "\n");
  		}
--- 343,349 ----
  	}
  
  	if (!argc && aflag) {
! 		for (i = 0; fields[i].name; i++) {
  			prfield(&fields[i], sep, vflag);
  			fprintf(out, "\n");
  		}