tno wide character constants; sigh - plan9port - [fork] Plan 9 from user space
(HTM) git clone git://src.adamsgaard.dk/plan9port
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit bb0266fe6137ecd81eea1c74e34723c5a1bc4caf
(DIR) parent bc7da02954403d4b46285b8f87a62d60c5eb58f8
(HTM) Author: rsc <devnull@localhost>
Date: Sat, 7 May 2005 22:42:06 +0000
no wide character constants; sigh
Diffstat:
M src/cmd/9660/jchar.c | 2 +-
M src/cmd/acme/ecmd.c | 4 ++--
M src/cmd/deroff.c | 8 ++++----
M src/cmd/dict/dict.c | 4 ++--
M src/cmd/ed.c | 16 ++++++++--------
M src/cmd/look.c | 12 ++++++------
M src/lib9/quote.c | 4 ++--
M src/libdisk/proto.c | 2 +-
M src/libregexp/regcomp.c | 34 ++++++++++++++++----------------
9 files changed, 43 insertions(+), 43 deletions(-)
---
(DIR) diff --git a/src/cmd/9660/jchar.c b/src/cmd/9660/jchar.c
t@@ -34,7 +34,7 @@ jolietstring(uchar *buf, int len)
int
isjolietfrog(Rune r)
{
- return r==L'*' || r==L'/' || r==L':'
+ return r=='*' || r=='/' || r==':'
|| r==';' || r=='?' || r=='\\';
}
(DIR) diff --git a/src/cmd/acme/ecmd.c b/src/cmd/acme/ecmd.c
t@@ -479,7 +479,7 @@ s_cmd(Text *t, Cmd *cp)
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){
t@@ -761,7 +761,7 @@ pdisplay(File *f)
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;
}
(DIR) diff --git a/src/cmd/deroff.c b/src/cmd/deroff.c
t@@ -847,11 +847,11 @@ sce(void)
{
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 == '.') {
(DIR) diff --git a/src/cmd/dict/dict.c b/src/cmd/dict/dict.c
t@@ -502,7 +502,7 @@ getpref(char *pat, Rune *pre)
case 0x7c: case 0x5e: case 0x24:
*pre = 0;
return p-pat;
- case L'\\':
+ case '\\':
p += n;
p += chartorune(++pre, p);
pre++;
t@@ -542,7 +542,7 @@ getfield(Rune *rp)
if ((c = Bgetrune(bindex)) < 0)
return 0;
if(c == '\t' || c == '\n') {
- *rp = L'\0';
+ *rp = '\0';
return 1;
}
*rp++ = c;
(DIR) diff --git a/src/cmd/ed.c b/src/cmd/ed.c
t@@ -393,7 +393,7 @@ commands(void)
newline();
count = addr2 - zero;
putd();
- putchr(L'\n');
+ putchr('\n');
continue;
case '!':
t@@ -419,7 +419,7 @@ printcom(void)
if(listn) {
count = a1-zero;
putd();
- putchr(L'\t');
+ putchr('\t');
}
putshst(getline(*a1++));
} while(a1 <= addr2);
t@@ -624,7 +624,7 @@ exfile(int om)
io = -1;
if(vflag) {
putd();
- putchr(L'\n');
+ putchr('\n');
}
}
t@@ -653,7 +653,7 @@ error1(char *s)
close(io);
io = -1;
}
- putchr(L'?');
+ putchr('?');
putst(s);
}
t@@ -687,7 +687,7 @@ notifyf(void *a, char *s)
if(strcmp(s, "interrupt") == 0){
if(rescuing || waiting)
noted(NCONT);
- putchr(L'\n');
+ putchr('\n');
lastc = '\n';
error1(Q);
notejmp(a, savej, 0);
t@@ -1496,7 +1496,7 @@ putd(void)
count /= 10;
if(count)
putd();
- putchr(r + L'0');
+ putchr(r + '0');
}
void
t@@ -1511,7 +1511,7 @@ putst(char *sp)
break;
putchr(r);
}
- putchr(L'\n');
+ putchr('\n');
}
void
t@@ -1520,7 +1520,7 @@ putshst(Rune *sp)
col = 0;
while(*sp)
putchr(*sp++);
- putchr(L'\n');
+ putchr('\n');
}
void
(DIR) diff --git a/src/cmd/look.c b/src/cmd/look.c
t@@ -10,16 +10,16 @@
#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')
t@@ -263,7 +263,7 @@ rcanon(Rune *old, Rune *new)
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))
t@@ -339,7 +339,7 @@ getword(Biobuf *f, Rune *rp, int n)
if(c < 0)
return 0;
if(c == '\n') {
- *rp = L'\0';
+ *rp = '\0';
return 1;
}
*rp++ = c;
(DIR) diff --git a/src/lib9/quote.c b/src/lib9/quote.c
t@@ -100,7 +100,7 @@ quotestrdup(char *s)
*u++ = '\'';
for(t=s; *t; t++){
r = *t;
- if(r == L'\'')
+ if(r == '\'')
*u++ = r; /* double the quote */
*u++ = r;
}
t@@ -126,7 +126,7 @@ quoterunestrdup(Rune *s)
*u++ = '\'';
for(t=s; *t; t++){
r = *t;
- if(r == L'\'')
+ if(r == '\'')
*u++ = r; /* double the quote */
*u++ = r;
}
(DIR) diff --git a/src/libdisk/proto.c b/src/libdisk/proto.c
t@@ -378,7 +378,7 @@ loop:
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)
(DIR) diff --git a/src/libregexp/regcomp.c b/src/libregexp/regcomp.c
t@@ -334,7 +334,7 @@ nextc(Rune *rp)
return 1;
}
exprp += chartorune(rp, exprp);
- if(*rp == L'\\'){
+ if(*rp == '\\'){
exprp += chartorune(rp, exprp);
return 1;
}
t@@ -358,25 +358,25 @@ lex(int literal, int dot_type)
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'^':
+ case '^':
return BOL;
- case L'$':
+ case '$':
return EOL;
- case L'[':
+ case '[':
return bldcclass();
}
return RUNE;
t@@ -399,11 +399,11 @@ bldcclass(void)
/* 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 */
t@@ -412,15 +412,15 @@ bldcclass(void)
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;
}