1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
Bug: https://bugs.gentoo.org/898116
--- a/GBase.cpp
+++ b/GBase.cpp
@@ -208,8 +208,8 @@ char* rstrstr(char* rstart, char *lend, char* substr) { /*like strstr, but star
//hash function used for strings in GHash
int strhash(const char* str){
- register int h=0;
- register int g;
+ int h=0;
+ int g;
while (*str) {
h=(h<<4)+*str++;
g=h&0xF0000000;
--- a/GString.cpp
+++ b/GString.cpp
@@ -364,8 +364,8 @@ GString& GString::appendfmt(const char *fmt,...) {
}
GString& GString::trim(char c) {
- register int istart;
- register int iend;
+ int istart;
+ int iend;
for (istart=0; istart<length() && chars()[istart]==c;istart++);
if (istart==length()) {
make_unique(); //edit operation ahead
@@ -384,8 +384,8 @@ GString& GString::trim(char c) {
}
GString& GString::trim(char* c) {
- register int istart;
- register int iend;
+ int istart;
+ int iend;
for (istart=0; istart<length() && strchr(c, chars()[istart])!=NULL ;istart++);
if (istart==length()) {
replace_data(0); //string was entirely trimmed
@@ -405,7 +405,7 @@ GString& GString::trim(char* c) {
GString& GString::trimR(char c) {
//only trim the right end
//register int istart;
- register int iend;
+ int iend;
for (iend=length()-1; iend>=0 && chars()[iend]==c;iend--);
if (iend==-1) {
replace_data(0); //string was entirely trimmed
@@ -423,7 +423,7 @@ GString& GString::trimR(char c) {
}
GString& GString::trimR(char* c) {
- register int iend;
+ int iend;
for (iend=length()-1; iend>=0 && strchr(c,chars()[iend])!=NULL;iend--);
if (iend==-1) {
replace_data(0); //string was entirely trimmed
@@ -440,7 +440,7 @@ GString& GString::trimR(char* c) {
}
GString& GString::trimL(char c) {
- register int istart;
+ int istart;
for (istart=0; istart<length() && chars()[istart]==c;istart++);
if (istart==length()) {
replace_data(0); //string was entirely trimmed
@@ -457,7 +457,7 @@ GString& GString::trimL(char c) {
}
GString& GString::trimL(char* c) {
- register int istart;
+ int istart;
for (istart=0; istart<length() && strchr(c,chars()[istart])!=NULL;istart++);
if (istart==length()) {
replace_data(0); //string was entirely trimmed
@@ -598,7 +598,7 @@ bool GString::is_space() const {
if (my_data == &null_data)
return false;
- for (register const char *p = chars(); *p; p++)
+ for (const char *p = chars(); *p; p++)
if (!isspace(*p))
return false;
@@ -889,7 +889,7 @@ GString& GString::append(const GString& s) {
GString& GString::upper() {
make_unique(); //edit operation ahead
- for (register char *p = chrs(); *p; p++)
+ for (char *p = chrs(); *p; p++)
*p = (char) toupper(*p);
return *this;
@@ -900,7 +900,7 @@ GString& GString::upper() {
GString& GString::lower() {
make_unique();
- for (register char *p = chrs(); *p; p++)
+ for (char *p = chrs(); *p; p++)
*p = (char) tolower(*p);
return *this;
|
