commit - bc7da02954403d4b46285b8f87a62d60c5eb58f8
commit + bb0266fe6137ecd81eea1c74e34723c5a1bc4caf
blob - c49da6351ce9598bad20a1b90561d07f280f5dd7
blob + ccd3b6db72f93b08ce6412bc5e834ceacf4786b5
--- src/cmd/9660/jchar.c
+++ src/cmd/9660/jchar.c
int
isjolietfrog(Rune r)
{
- return r==L'*' || r==L'/' || r==L':'
+ return r=='*' || r=='/' || r==':'
|| r==';' || r=='?' || r=='\\';
}
blob - eed45503909a3e1de1142429476fbcbbab8bbbd5
blob + 6fef0698fa389fad9558c5af165a40ad8580e633
--- src/cmd/acme/ecmd.c
+++ src/cmd/acme/ecmd.c
buf = allocstring(0);
for(m=0; m<nrp; m++){
buf->n = 0;
- buf->r[0] = L'\0';
+ buf->r[0] = '\0';
sel = rp[m];
for(i = 0; i<cp->u.text->n; i++)
if((c = cp->u.text->r[i])=='\\' && i<cp->u.text->n-1){
if(np>RBUFSIZE-1)
np = RBUFSIZE-1;
bufread(&f->b, p1, buf, np);
- buf[np] = L'\0';
+ buf[np] = '\0';
warning(nil, "%S", buf);
p1 += np;
}
blob - 914c5a3f5f1e38832b669a1566ca0c3c446bf6bf
blob + 1b758efec074c7165289f7cf5f9ccc153c110978
--- src/cmd/deroff.c
+++ src/cmd/deroff.c
{
int n = 1;
- while (C != L'\n' && !(L'0' <= c && c <= L'9'))
+ while (C != '\n' && !('0' <= c && c <= '9'))
;
- if (c != L'\n') {
- for (n = c-L'0';'0' <= C && c <= L'9';)
- n = n*10 + c-L'0';
+ if (c != '\n') {
+ for (n = c-'0';'0' <= C && c <= '9';)
+ n = n*10 + c-'0';
}
while(n) {
if(C == '.') {
blob - 4526648e70b22cc5eb1721ca776fbb47a2c04358
blob + 6704775a3f3ae17ed46829479b8395095078ced4
--- src/cmd/dict/dict.c
+++ src/cmd/dict/dict.c
case 0x7c: case 0x5e: case 0x24:
*pre = 0;
return p-pat;
- case L'\\':
+ case '\\':
p += n;
p += chartorune(++pre, p);
pre++;
if ((c = Bgetrune(bindex)) < 0)
return 0;
if(c == '\t' || c == '\n') {
- *rp = L'\0';
+ *rp = '\0';
return 1;
}
*rp++ = c;
blob - 0b4be5906d93029516c9b45d5696366568566259
blob + f44acb062a0e93d160582b45b7c411fca867c637
--- src/cmd/ed.c
+++ src/cmd/ed.c
newline();
count = addr2 - zero;
putd();
- putchr(L'\n');
+ putchr('\n');
continue;
case '!':
if(listn) {
count = a1-zero;
putd();
- putchr(L'\t');
+ putchr('\t');
}
putshst(getline(*a1++));
} while(a1 <= addr2);
io = -1;
if(vflag) {
putd();
- putchr(L'\n');
+ putchr('\n');
}
}
close(io);
io = -1;
}
- putchr(L'?');
+ putchr('?');
putst(s);
}
if(strcmp(s, "interrupt") == 0){
if(rescuing || waiting)
noted(NCONT);
- putchr(L'\n');
+ putchr('\n');
lastc = '\n';
error1(Q);
notejmp(a, savej, 0);
count /= 10;
if(count)
putd();
- putchr(r + L'0');
+ putchr(r + '0');
}
void
break;
putchr(r);
}
- putchr(L'\n');
+ putchr('\n');
}
void
col = 0;
while(*sp)
putchr(*sp++);
- putchr(L'\n');
+ putchr('\n');
}
void
blob - f447b8dba23ed15edec2280a998efc7e4f7cf3d6
blob + 369afe1b32dab5fcea328a47d554a02714ed0488
--- src/cmd/look.c
+++ src/cmd/look.c
#undef isalnum
#undef isspace
#undef tolower
-#define isupper(r) (L'A' <= (r) && (r) <= L'Z')
-#define islower(r) (L'a' <= (r) && (r) <= L'z')
+#define isupper(r) ('A' <= (r) && (r) <= 'Z')
+#define islower(r) ('a' <= (r) && (r) <= 'z')
#define isalpha(r) (isupper(r) || islower(r))
#define islatin1(r) (0xC0 <= (r) && (r) <= 0xFF)
-#define isdigit(r) (L'0' <= (r) && (r) <= L'9')
+#define isdigit(r) ('0' <= (r) && (r) <= '9')
#define isalnum(r) (isalpha(r) || isdigit(r))
-#define isspace(r) ((r) == L' ' || (r) == L'\t' \
+#define isspace(r) ((r) == ' ' || (r) == '\t' \
|| (0x0A <= (r) && (r) <= 0x0D))
#define tolower(r) ((r)-'A'+'a')
if (islatin1(r) && latin_fold_tab[r-0xc0])
r = latin_fold_tab[r-0xc0];
if(direc)
- if(!(isalnum(r) || r == L' ' || r == L'\t'))
+ if(!(isalnum(r) || r == ' ' || r == '\t'))
continue;
if(fold)
if(isupper(r))
if(c < 0)
return 0;
if(c == '\n') {
- *rp = L'\0';
+ *rp = '\0';
return 1;
}
*rp++ = c;
blob - 32f434c4fb2633d7e6027f74c024a6ceda318e88
blob + f850009ad003122a0ff59286d6d0f67ff564f662
--- src/lib9/quote.c
+++ src/lib9/quote.c
*u++ = '\'';
for(t=s; *t; t++){
r = *t;
- if(r == L'\'')
+ if(r == '\'')
*u++ = r; /* double the quote */
*u++ = r;
}
*u++ = '\'';
for(t=s; *t; t++){
r = *t;
- if(r == L'\'')
+ if(r == '\'')
*u++ = r; /* double the quote */
*u++ = r;
}
blob - d1b136d5aca7bca3f73b40d4ac0010124d11472a
blob + 9d5ff15b97a8e0d5dbd477505b31894b98b9a019
--- src/libdisk/proto.c
+++ src/libdisk/proto.c
f->new = mkpath(mkaux, old->new, elem);
free(elem);
- f->elem = utfrrune(f->new, L'/') + 1;
+ f->elem = utfrrune(f->new, '/') + 1;
p = getmode(mkaux, p, &f->mode);
p = getname(mkaux, p, &f->uid); /* LEAK */
if(p == nil)
blob - 87acd7aca5ab787d3735f775e8b1899140805366
blob + 178b7783219094850d86a667ecc7ce4760c7a735
--- src/libregexp/regcomp.c
+++ src/libregexp/regcomp.c
return 1;
}
exprp += chartorune(rp, exprp);
- if(*rp == L'\\'){
+ if(*rp == '\\'){
exprp += chartorune(rp, exprp);
return 1;
}
switch(yyrune){
case 0:
return END;
- case L'*':
+ case '*':
return STAR;
- case L'?':
+ case '?':
return QUEST;
- case L'+':
+ case '+':
return PLUS;
- case L'|':
+ case '|':
return OR;
- case L'.':
+ case '.':
return dot_type;
- case L'(':
+ case '(':
return LBRA;
- case L')':
+ case ')':
return RBRA;
- case L'^':
- return BOL;
- case L'$':
+ case '^':
+ return BOL;
+ case '$':
return EOL;
- case L'[':
+ case '[':
return bldcclass();
}
return RUNE;
/* SPECIAL CASE!!! negated classes don't match \n */
ep = r;
quoted = nextc(&rune);
- if(!quoted && rune == L'^'){
+ if(!quoted && rune == '^'){
type = NCCLASS;
quoted = nextc(&rune);
- *ep++ = L'\n';
- *ep++ = L'\n';
+ *ep++ = '\n';
+ *ep++ = '\n';
}
/* parse class into a set of spans */
rcerror("malformed '[]'");
return 0;
}
- if(!quoted && rune == L']')
+ if(!quoted && rune == ']')
break;
- if(!quoted && rune == L'-'){
+ if(!quoted && rune == '-'){
if(ep == r){
rcerror("malformed '[]'");
return 0;
}
quoted = nextc(&rune);
- if((!quoted && rune == L']') || rune == 0){
+ if((!quoted && rune == ']') || rune == 0){
rcerror("malformed '[]'");
return 0;
}