From 80174b60033b8439eb06256f7ce9a51a26c6f7ed Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Fri, 21 Jun 2013 22:44:07 +0200 Subject: cppcheck (bzr r12382) --- src/unicoderange.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/unicoderange.cpp') diff --git a/src/unicoderange.cpp b/src/unicoderange.cpp index dcf461214..67239d0d2 100644 --- a/src/unicoderange.cpp +++ b/src/unicoderange.cpp @@ -37,8 +37,10 @@ int UnicodeRange::add_range(gchar* val){ Urange r; int i=0, count=0; - while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=',') i++; - r.start = (gchar*) malloc((i+1)*sizeof(gchar*)); + while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=','){ + i++; + } + r.start = (gchar*) malloc((i+1)*sizeof(gchar*)); strncpy(r.start, val, i); r.start[i] = '\0'; val+=i; @@ -50,7 +52,7 @@ UnicodeRange::add_range(gchar* val){ r.end = (gchar*) malloc((i+1)*sizeof(gchar*)); strncpy(r.end, val, i); r.end[i] = '\0'; - val+=i; + // val+=i; count+=i; } else { r.end=NULL; -- cgit v1.2.3 From 82f86789e746672e91bdd287c534546f6af0b456 Mon Sep 17 00:00:00 2001 From: Kris De Gussem Date: Sun, 4 Aug 2013 16:24:43 +0200 Subject: cppcheck: c-style casts > c++ style casts (bzr r12466) --- src/unicoderange.cpp | 193 ++++++++++++++++++++++++++------------------------- 1 file changed, 97 insertions(+), 96 deletions(-) (limited to 'src/unicoderange.cpp') diff --git a/src/unicoderange.cpp b/src/unicoderange.cpp index 67239d0d2..36435024d 100644 --- a/src/unicoderange.cpp +++ b/src/unicoderange.cpp @@ -4,124 +4,125 @@ #include static unsigned int hex2int(char* s){ - int res=0; - int i=0, mul=1; - while(s[i+1]!='\0') i++; + int res=0; + int i=0, mul=1; + while(s[i+1]!='\0') i++; - while(i>=0){ - if (s[i] >= 'A' && s[i] <= 'F') res += mul * (s[i]-'A'+10); - if (s[i] >= 'a' && s[i] <= 'f') res += mul * (s[i]-'a'+10); - if (s[i] >= '0' && s[i] <= '9') res += mul * (s[i]-'0'); - i--; - mul*=16; - } - return res; + while(i>=0){ + if (s[i] >= 'A' && s[i] <= 'F') res += mul * (s[i]-'A'+10); + if (s[i] >= 'a' && s[i] <= 'f') res += mul * (s[i]-'a'+10); + if (s[i] >= '0' && s[i] <= '9') res += mul * (s[i]-'0'); + i--; + mul*=16; + } + return res; } UnicodeRange::UnicodeRange(const gchar* value){ - if (!value) return; - gchar* val = (gchar*) value; - while(val[0] != '\0'){ - if (val[0]=='U' && val[1]=='+'){ - val += add_range(val+2); - } else { - this->unichars.push_back(g_utf8_get_char(&val[0])); - val++; - } - //skip spaces or commas - while(val[0]==' ' || val[0]==',') val++; - } + if (!value) return; + gchar* val = (gchar*) value; + while(val[0] != '\0'){ + if (val[0]=='U' && val[1]=='+'){ + val += add_range(val+2); + } else { + this->unichars.push_back(g_utf8_get_char(&val[0])); + val++; + } + //skip spaces or commas + while(val[0]==' ' || val[0]==',') val++; + } } -int -UnicodeRange::add_range(gchar* val){ - Urange r; - int i=0, count=0; - while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=','){ +int UnicodeRange::add_range(gchar* val){ + Urange r; + int i=0, count=0; + while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=','){ i++; - } + } r.start = (gchar*) malloc((i+1)*sizeof(gchar*)); - strncpy(r.start, val, i); - r.start[i] = '\0'; - val+=i; - count+=i; - i=0; - if (val[0]=='-'){ - val++; - while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=',') i++; - r.end = (gchar*) malloc((i+1)*sizeof(gchar*)); - strncpy(r.end, val, i); - r.end[i] = '\0'; - // val+=i; - count+=i; - } else { - r.end=NULL; - } - this->range.push_back(r); - return count+1; + strncpy(r.start, val, i); + r.start[i] = '\0'; + val+=i; + count+=i; + i=0; + if (val[0]=='-'){ + val++; + while(val[i]!='\0' && val[i]!='-' && val[i]!=' ' && val[i]!=',') i++; + r.end = (gchar*) malloc((i+1)*sizeof(gchar*)); + strncpy(r.end, val, i); + r.end[i] = '\0'; + // val+=i; + count+=i; + } else { + r.end=NULL; + } + this->range.push_back(r); + return count+1; } bool UnicodeRange::contains(gchar unicode){ - for(unsigned int i=0;iunichars.size();i++){ - if ((gunichar) unicode == this->unichars[i]) return true; - } + for(unsigned int i=0;iunichars.size();i++){ + if (static_cast(unicode) == this->unichars[i]){ + return true; + } + } - unsigned int unival; - unival = g_utf8_get_char (&unicode); - char uni[9] = "00000000"; - uni[8]= '\0'; - unsigned char val; - for (unsigned int i=7; unival>0; i--){ - val = unival & 0xf; - unival = unival >> 4; - if (val < 10) uni[i] = '0' + val; - else uni[i] = 'A'+ val - 10; - } + unsigned int unival; + unival = g_utf8_get_char (&unicode); + char uni[9] = "00000000"; + uni[8]= '\0'; + unsigned char val; + for (unsigned int i=7; unival>0; i--){ + val = unival & 0xf; + unival = unival >> 4; + if (val < 10) uni[i] = '0' + val; + else uni[i] = 'A'+ val - 10; + } - bool found; - for(unsigned int i=0;irange.size();i++){ - Urange r = this->range[i]; - if (r.end){ - if (unival >= hex2int(r.start) && unival <= hex2int(r.end)) return true; - } else { - found = true; + bool found; + for(unsigned int i=0;irange.size();i++){ + Urange r = this->range[i]; + if (r.end){ + if (unival >= hex2int(r.start) && unival <= hex2int(r.end)) return true; + } else { + found = true; - int p=0; - while (r.start[p]!='\0') p++; - p--; + int p=0; + while (r.start[p]!='\0') p++; + p--; - for (int pos=8;p>=0;pos--,p--){ - if (uni[pos]!='?' && uni[pos]!=r.start[p]) found = false; - } - if (found) return true; - } - } - return false; + for (int pos=8;p>=0;pos--,p--){ + if (uni[pos]!='?' && uni[pos]!=r.start[p]) found = false; + } + if (found) return true; + } + } + return false; } Glib::ustring UnicodeRange::attribute_string(){ - Glib::ustring result; - unsigned int i; - for(i=0; iunichars.size(); i++){ - result += this->unichars[i]; - if (i!=this->unichars.size()-1) result += ","; - } + Glib::ustring result; + unsigned int i; + for(i=0; iunichars.size(); i++){ + result += this->unichars[i]; + if (i!=this->unichars.size()-1) result += ","; + } - for(i=0; irange.size(); i++){ - result += "U+" + Glib::ustring(this->range[i].start); - if (this->range[i].end) result += "-" + Glib::ustring(this->range[i].end); - if (i!=this->range.size()-1) result += ", "; - } + for(i=0; irange.size(); i++){ + result += "U+" + Glib::ustring(this->range[i].start); + if (this->range[i].end) result += "-" + Glib::ustring(this->range[i].end); + if (i!=this->range.size()-1) result += ", "; + } - return result; + return result; } gunichar UnicodeRange::sample_glyph(){ - //This could be better - if (!unichars.empty()) - return unichars[0]; - if (!range.empty()) - return hex2int(range[0].start); - return (gunichar) ' '; + //This could be better + if (!unichars.empty()) + return unichars[0]; + if (!range.empty()) + return hex2int(range[0].start); + return (gunichar) ' '; } -- cgit v1.2.3 From c0f2f5606f0884e00f426653168b84b23d26ffb3 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Mon, 5 Aug 2013 23:07:35 +0200 Subject: code cleanup (cppcheck) (bzr r12469) --- src/unicoderange.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/unicoderange.cpp') diff --git a/src/unicoderange.cpp b/src/unicoderange.cpp index 36435024d..803e1a884 100644 --- a/src/unicoderange.cpp +++ b/src/unicoderange.cpp @@ -71,9 +71,8 @@ bool UnicodeRange::contains(gchar unicode){ unival = g_utf8_get_char (&unicode); char uni[9] = "00000000"; uni[8]= '\0'; - unsigned char val; for (unsigned int i=7; unival>0; i--){ - val = unival & 0xf; + unsigned char val = unival & 0xf; unival = unival >> 4; if (val < 10) uni[i] = '0' + val; else uni[i] = 'A'+ val - 10; -- cgit v1.2.3