Browse Source

Killed [-Wchar-subscripts] warnings

Gerard van de Schoot 8 years ago
parent
commit
78fccfbfc0
4 changed files with 11 additions and 11 deletions
  1. 3 3
      sys/src/cmd/cb/cb.c
  2. 3 3
      sys/src/cmd/file.c
  3. 1 1
      sys/src/cmd/gview.c
  4. 4 4
      sys/src/libmp/port/strtomp.c

+ 3 - 3
sys/src/cmd/cb/cb.c

@@ -699,7 +699,7 @@ gotop(int c)
 	char *a, *b;
 	op_ptr = optmp;
 	*op_ptr++ = c;
-	while (isop(( *op_ptr = getch())))op_ptr++;
+	while (isop(( (uint8_t)(*op_ptr = getch()) )))op_ptr++;
 	if(!strict)unget(*op_ptr);
 	else if (*op_ptr != ' ')unget( *op_ptr);
 	*op_ptr = '\0';
@@ -859,7 +859,7 @@ lookup(char *first, char *last)
 	ptr = key;
 	while ((ckey = ptr->name) != 0){
 		for (k = cptr; (*ckey == *k && *ckey != '\0'); k++, ckey++);
-		if(*ckey=='\0' && (k==last|| (k<last && !isalnum(*k)))){
+		if(*ckey=='\0' && (k==last|| (k<last && !isalnum((uint8_t)*k)))){
 			opflag = 1;
 			lastlook = 0;
 			return(ptr);
@@ -969,7 +969,7 @@ getnext(int must){
 	}
 	tp = lastplace;
 	if(inswitch && tptr <= lastplace)
-		if (isalnum(*lastplace)||ispunct(*lastplace)||isop(*lastplace))return(lastplace);
+		if (isalnum((uint8_t)*lastplace)||ispunct((uint8_t)*lastplace)||isop((uint8_t)*lastplace))return(lastplace);
 space:
 	while(isspace(c=Bgetc(input)))puttmp(c,1);
 	beg = tp;

+ 3 - 3
sys/src/cmd/file.c

@@ -1157,17 +1157,17 @@ isenglish(void)
 
 	vow = 0;
 	for(p="AEIOU"; *p; p++) {
-		vow += cfreq[*p];
+		vow += cfreq[(uint8_t)*p];
 		vow += cfreq[tolower(*p)];
 	}
 	comm = 0;
 	for(p="ETAION"; *p; p++) {
-		comm += cfreq[*p];
+		comm += cfreq[(uint8_t)*p];
 		comm += cfreq[tolower(*p)];
 	}
 	rare = 0;
 	for(p="VJKQXZ"; *p; p++) {
-		rare += cfreq[*p];
+		rare += cfreq[(uint8_t)*p];
 		rare += cfreq[tolower(*p)];
 	}
 	if(vow*5 >= nbuf-cfreq[' '] && comm >= 10*rare) {

+ 1 - 1
sys/src/cmd/gview.c

@@ -302,7 +302,7 @@ thick_color* parse_color_chars(const char* c0, const char* fin,
 			if (++c==fin)
 				return tc_default(tc);
 			else tc[i].thick=1;
-		j = (*c&~127) ? -1 : nam1_idx[*c];
+		j = (*c&~127) ? -1 : nam1_idx[(uint8_t)*c];
 		if (j < 0)
 			return tc_default(tc);
 		tc[i].clr = clrtab[j].im;

+ 4 - 4
sys/src/libmp/port/strtomp.c

@@ -41,13 +41,13 @@ init(void)
 	memset(tab.t10, INVAL, sizeof(tab.t10));
 
 	for(p = set64; *p; p++)
-		tab.t64[*p] = p-set64;
+		tab.t64[(uint8_t)*p] = p-set64;
 	for(p = set32; *p; p++)
-		tab.t32[*p] = p-set32;
+		tab.t32[(uint8_t)*p] = p-set32;
 	for(p = set16; *p; p++)
-		tab.t16[*p] = (p-set16)%16;
+		tab.t16[(uint8_t)*p] = (p-set16)%16;
 	for(p = set10; *p; p++)
-		tab.t10[*p] = (p-set10);
+		tab.t10[(uint8_t)*p] = (p-set10);
 
 	tab.inited = 1;
 }