qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 10:34:46 -07:00
Code Releases Activity

remove incorrect (!) consts

Browse Source 
-r

SVN=126198
This commit is contained in:
Ken Thompson 2008-07-07 15:00:12 -07:00
parent 5b904a3bde
commit 999b12c768
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib9/utf/utf.h
View File

@ -68,7 +68,7 @@ int chartorune(Rune* r, const char* s);
// n bytes of s. If the UTF sequence is incomplete within n bytes, // n bytes of s. If the UTF sequence is incomplete within n bytes,
// charntorune will set *r to Runeerror and return 0. If it is complete // charntorune will set *r to Runeerror and return 0. If it is complete
// but not in UTF format, it will set *r to Runeerror and return 1. // but not in UTF format, it will set *r to Runeerror and return 1.
// //
// Added 2004-09-24 by Wei-Hwa Huang // Added 2004-09-24 by Wei-Hwa Huang
int charntorune(Rune* r, const char* s, int n); int charntorune(Rune* r, const char* s, int n);
@ -123,7 +123,7 @@ int utfnlen(const char* s, long n);
// byte terminating a string is considered to be part of the string s. // byte terminating a string is considered to be part of the string s.
// (cf. strchr) // (cf. strchr)
const char* utfrune(const char* s, Rune r); /*const*/ char* utfrune(const char* s, Rune r);
// utfrrune returns a pointer to the last occurrence of rune r in the // utfrrune returns a pointer to the last occurrence of rune r in the
@ -131,7 +131,7 @@ const char* utfrune(const char* s, Rune r);
// byte terminating a string is considered to be part of the string s. // byte terminating a string is considered to be part of the string s.
// (cf. strrchr) // (cf. strrchr)
const char* utfrrune(const char* s, Rune r); /*const*/ char* utfrrune(const char* s, Rune r);
// utfutf returns a pointer to the first occurrence of the UTF string // utfutf returns a pointer to the first occurrence of the UTF string
@ -152,7 +152,7 @@ char* utfecpy(char *s1, char *es1, const char *s2);
// These functions are rune-string analogues of the corresponding // These functions are rune-string analogues of the corresponding
// functions in strcat (3). // functions in strcat (3).
// //
// These routines first appeared in Plan 9. // These routines first appeared in Plan 9.
// SEE ALSO // SEE ALSO
// memmove (3) // memmove (3)
@ -205,8 +205,8 @@ Rune totitlerune(Rune r);
// isupperrune tests for upper case characters, including Unicode // isupperrune tests for upper case characters, including Unicode
// upper case letters and targets of the toupper mapping. islowerrune // upper case letters and targets of the toupper mapping. islowerrune
// and istitlerune are defined analogously. // and istitlerune are defined analogously.
int isupperrune(Rune r); int isupperrune(Rune r);
int islowerrune(Rune r); int islowerrune(Rune r);
int istitlerune(Rune r); int istitlerune(Rune r);

4
src/lib9/utf/utfrrune.c
View File

@ -16,7 +16,7 @@
#include "utf.h" #include "utf.h"
#include "utfdef.h" #include "utfdef.h"
const /* const - removed for go code */
char* char*
utfrrune(const char *s, Rune c) utfrrune(const char *s, Rune c)
{ {
@ -32,7 +32,7 @@ utfrrune(const char *s, Rune c)
c1 = *(uchar*)s; c1 = *(uchar*)s;
if(c1 < Runeself) { /* one byte rune */ if(c1 < Runeself) { /* one byte rune */
if(c1 == 0) if(c1 == 0)
return s1; return (char*)s1;
if(c1 == c) if(c1 == c)
s1 = s; s1 = s;
s++; s++;

6
src/lib9/utf/utfrune.c
View File

@ -16,7 +16,7 @@
#include "utf.h" #include "utf.h"
#include "utfdef.h" #include "utfdef.h"
const /* const - removed for go code */
char* char*
utfrune(const char *s, Rune c) utfrune(const char *s, Rune c)
{ {
@ -33,13 +33,13 @@ utfrune(const char *s, Rune c)
if(c1 == 0) if(c1 == 0)
return 0; return 0;
if(c1 == c) if(c1 == c)
return s; return (char*)s;
s++; s++;
continue; continue;
} }
n = chartorune(&r, s); n = chartorune(&r, s);
if(r == c) if(r == c)
return s; return (char*)s;
s += n; s += n;
} }
return 0; return 0;