===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/pctr/pctr.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** src/usr.bin/pctr/pctr.c	2015/01/16 06:40:10	1.21
--- src/usr.bin/pctr/pctr.c	2015/02/08 23:40:34	1.22
***************
*** 1,4 ****
! /*	$OpenBSD: pctr.c,v 1.21 2015/01/16 06:40:10 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
--- 1,4 ----
! /*	$OpenBSD: pctr.c,v 1.22 2015/02/08 23:40:34 deraadt Exp $	*/
  
  /*
   * Copyright (c) 2007 Mike Belopuhov, Aleksey Lomovtsev
***************
*** 73,88 ****
  	while ((ch = getopt(argc, argv, "AcEef:IiklMm:Ss:t:u")) != -1)
  		switch (ch) {
  		case 'A':
! 			Aflag++;
  			break;
  		case 'c':
! 			cflag++;
  			break;
  		case 'E':
! 			Eflag++;
  			break;
  		case 'e':
! 			eflag++;
  			break;
  		case 'f':
  			if (sscanf(optarg, "%x", &func) <= 0 || func < 0 ||
--- 73,88 ----
  	while ((ch = getopt(argc, argv, "AcEef:IiklMm:Ss:t:u")) != -1)
  		switch (ch) {
  		case 'A':
! 			Aflag = 1;
  			break;
  		case 'c':
! 			cflag = 1;
  			break;
  		case 'E':
! 			Eflag = 1;
  			break;
  		case 'e':
! 			eflag = 1;
  			break;
  		case 'f':
  			if (sscanf(optarg, "%x", &func) <= 0 || func < 0 ||
***************
*** 90,108 ****
  				errx(1, "invalid function number");
  			break;
  		case 'I':
! 			Iflag++;
  			break;
  		case 'i':
! 			iflag++;
  			break;
  		case 'k':
! 			kflag++;
  			break;
  		case 'l':
! 			list_mode++;
  			break;
  		case 'M':
! 			Mflag++;
  			break;
  		case 'm':
  			if (sscanf(optarg, "%x", &masku) <= 0 || masku < 0 ||
--- 90,108 ----
  				errx(1, "invalid function number");
  			break;
  		case 'I':
! 			Iflag = 1;
  			break;
  		case 'i':
! 			iflag = 1;
  			break;
  		case 'k':
! 			kflag = 1;
  			break;
  		case 'l':
! 			list_mode = 1;
  			break;
  		case 'M':
! 			Mflag = 1;
  			break;
  		case 'm':
  			if (sscanf(optarg, "%x", &masku) <= 0 || masku < 0 ||
***************
*** 110,119 ****
  				errx(1, "invalid unit mask number");
  			break;
  		case 'S':
! 			Sflag++;
  			break;
  		case 's':
! 			set_mode++;
  			ctr = strtonum(optarg, 0, PCTR_NUM-1, &errstr);
  			if (errstr)
  				errx(1, "counter number is %s: %s", errstr,
--- 110,119 ----
  				errx(1, "invalid unit mask number");
  			break;
  		case 'S':
! 			Sflag = 1;
  			break;
  		case 's':
! 			set_mode = 1;
  			ctr = strtonum(optarg, 0, PCTR_NUM-1, &errstr);
  			if (errstr)
  				errx(1, "counter number is %s: %s", errstr,
***************
*** 125,131 ****
  				errx(1, "threshold is %s: %s", errstr, optarg);
  			break;
  		case 'u':
! 			uflag++;
  			break;
  		default:
  			usage();
--- 125,131 ----
  				errx(1, "threshold is %s: %s", errstr, optarg);
  			break;
  		case 'u':
! 			uflag = 1;
  			break;
  		default:
  			usage();