projects
/
anna.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suuports clang compiler
[anna.git]
/
source
/
core
/
functions.cpp
diff --git
a/source/core/functions.cpp
b/source/core/functions.cpp
index
b007966
..
a23a0d1
100644
(file)
--- a/
source/core/functions.cpp
+++ b/
source/core/functions.cpp
@@
-277,7
+277,7
@@
throw(RuntimeException) {
int aux;
int j = 0;
int aux;
int j = 0;
- for(
register
int ii = 1, maxii = hexString.length(); ii < maxii; ii += 2) {
+ for(int ii = 1, maxii = hexString.length(); ii < maxii; ii += 2) {
if(isxdigit(aux = src [ii - 1]) == 0)
throw RuntimeException("Invalid HexString", ANNA_FILE_LOCATION);
if(isxdigit(aux = src [ii - 1]) == 0)
throw RuntimeException("Invalid HexString", ANNA_FILE_LOCATION);
@@
-450,7
+450,7
@@
throw() {
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
};
int r = -1; // r will be lg(v)
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7
};
int r = -1; // r will be lg(v)
-
register
unsigned int t, tt; // temporaries
+ unsigned int t, tt; // temporaries
if(tt = v >> 16) {
r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt];
if(tt = v >> 16) {
r = (t = tt >> 8) ? 24 + LogTable256[t] : 16 + LogTable256[tt];
@@
-488,7
+488,7
@@
std::string functions::justify(const std::string & title, TextJustifyMode::_v mo
}
if((mode == TextJustifyMode::Right) || (mode == TextJustifyMode::Center)) {
}
if((mode == TextJustifyMode::Right) || (mode == TextJustifyMode::Center)) {
- for(
register
int k = 0; k < (repeat + (adjust ? 1 : 0)); k++) result += filler;
+ for(int k = 0; k < (repeat + (adjust ? 1 : 0)); k++) result += filler;
result += " ";
}
result += " ";
}
@@
-498,7
+498,7
@@
std::string functions::justify(const std::string & title, TextJustifyMode::_v mo
if((mode == TextJustifyMode::Left) || (mode == TextJustifyMode::Center)) {
result += " ";
if((mode == TextJustifyMode::Left) || (mode == TextJustifyMode::Center)) {
result += " ";
- for(
register
int k = 0; k < repeat; k++) result += filler;
+ for(int k = 0; k < repeat; k++) result += filler;
}
return result;
}
return result;
@@
-517,13
+517,13
@@
std::string functions::highlight(const std::string & title, TextHighlightMode::_
}
if((mode == TextHighlightMode::Leftline) || (mode == TextHighlightMode::LeftAndRightline)) {
}
if((mode == TextHighlightMode::Leftline) || (mode == TextHighlightMode::LeftAndRightline)) {
- for(
register
int k = 0; k < (lr_repeat + (adjust ? 1 : 0)); k++) result += filler;
+ for(int k = 0; k < (lr_repeat + (adjust ? 1 : 0)); k++) result += filler;
result += " ";
}
if((mode == TextHighlightMode::Overline) || (mode == TextHighlightMode::OverAndUnderline)) {
result += " ";
}
if((mode == TextHighlightMode::Overline) || (mode == TextHighlightMode::OverAndUnderline)) {
- for(
register
int k = 0; k < ou_repeat; k++) result += filler;
+ for(int k = 0; k < ou_repeat; k++) result += filler;
result += "\n";
}
result += "\n";
}
@@
-533,13
+533,13
@@
std::string functions::highlight(const std::string & title, TextHighlightMode::_
if((mode == TextHighlightMode::Underline) || (mode == TextHighlightMode::OverAndUnderline)) {
result += "\n";
if((mode == TextHighlightMode::Underline) || (mode == TextHighlightMode::OverAndUnderline)) {
result += "\n";
- for(
register
int k = 0; k < ou_repeat; k++) result += filler;
+ for(int k = 0; k < ou_repeat; k++) result += filler;
}
if((mode == TextHighlightMode::Rightline) || (mode == TextHighlightMode::LeftAndRightline)) {
result += " ";
}
if((mode == TextHighlightMode::Rightline) || (mode == TextHighlightMode::LeftAndRightline)) {
result += " ";
- for(
register
int k = 0; k < lr_repeat; k++) result += filler;
+ for(int k = 0; k < lr_repeat; k++) result += filler;
}
if(appendCR) result += "\n";
}
if(appendCR) result += "\n";
@@
-553,7
+553,7
@@
std::string functions::tab(const std::string & text, int tabSpaces) throw() {
size_t pos, from = 0;
std::string tab, crTab = "\n";
size_t pos, from = 0;
std::string tab, crTab = "\n";
- for(
register
int k = 0; k < tabSpaces; k++) tab += " ";
+ for(int k = 0; k < tabSpaces; k++) tab += " ";
crTab += tab;
result = tab;
crTab += tab;
result = tab;
@@
-699,7
+699,7
@@
std::string functions::asAsciiString(const char * buffer, int size, bool & isFul
return result;
}
return result;
}
- for(
register
int k = 0; k < size; k ++) {
+ for(int k = 0; k < size; k ++) {
unsigned char c = (unsigned char) buffer [k];
int printable = isprint(c);
result += (printable ? (char) c : '.');
unsigned char c = (unsigned char) buffer [k];
int printable = isprint(c);
result += (printable ? (char) c : '.');
@@
-780,7
+780,7
@@
anna::DataBlock functions::rawIpPresentationAsRaw(const std::string & rawPresent
char rByte[3]; // readable byte
rByte[2] = 0;
char rByte[3]; // readable byte
rByte[2] = 0;
- for(
register
int k = 0; k < length; k += 2) {
+ for(int k = 0; k < length; k += 2) {
rByte[0] = rawPresentation[k];
rByte[1] = rawPresentation[k + 1];
sscanf(rByte, "%x", &byte);
rByte[0] = rawPresentation[k];
rByte[1] = rawPresentation[k + 1];
sscanf(rByte, "%x", &byte);
@@
-802,7
+802,7
@@
std::string functions::rawIpAsRawIpPresentation(const anna::DataBlock & db) thro
char rByte[3]; // readable byte
rByte[2] = 0;
char rByte[3]; // readable byte
rByte[2] = 0;
- for(
register
int k = 0; k < length; k++) {
+ for(int k = 0; k < length; k++) {
byte = (unsigned char)db[k];
sprintf(rByte, "%.2X", byte);
result += rByte;
byte = (unsigned char)db[k];
sprintf(rByte, "%.2X", byte);
result += rByte;
@@
-864,7
+864,7
@@
bool functions::isIPv4(const std::string & ip, IPv4Type::_v ipv4Type) throw() {
// La expresión regular no controla si hay mas de 3 puntos:
int n_dot = 0;
// La expresión regular no controla si hay mas de 3 puntos:
int n_dot = 0;
- for(
register
int k = 0; k < ip.length(); k++)
+ for(int k = 0; k < ip.length(); k++)
if(ip[k] == '.') n_dot++;
if(n_dot > 3)
if(ip[k] == '.') n_dot++;
if(n_dot > 3)
@@
-911,7
+911,7
@@
bool functions::isIPv4(const std::string & ip, IPv4Type::_v ipv4Type) throw() {
bool functions::isIPv6(const std::string & ip) throw() {
// Chequeo de digitos permitidos:
bool functions::isIPv6(const std::string & ip) throw() {
// Chequeo de digitos permitidos:
- for(
register
int k = 0; k < ip.length(); k++) {
+ for(int k = 0; k < ip.length(); k++) {
bool digit = isdigit(ip[k]);
bool hex = ((ip[k] == 'a') ||
(ip[k] == 'b') ||
bool digit = isdigit(ip[k]);
bool hex = ((ip[k] == 'a') ||
(ip[k] == 'b') ||
@@
-965,7
+965,7
@@
std::string functions::IPv4To6(const std::string & ip) throw(anna::RuntimeExcept
// Number of ocurrences for '.'
int n_dot = 0;
// Number of ocurrences for '.'
int n_dot = 0;
- for(
register
int k = 0; k < pureIPv4.length(); k++)
+ for(int k = 0; k < pureIPv4.length(); k++)
if(pureIPv4[k] == '.') n_dot++;
if(n_dot > 3)
if(pureIPv4[k] == '.') n_dot++;
if(n_dot > 3)
@@
-1016,13
+1016,13
@@
std::string functions::normalizeIP(const std::string & ip) throw(anna::RuntimeEx
// Number of ocurrences for ':'
int n_colon = 0;
// Number of ocurrences for ':'
int n_colon = 0;
- for(
register
int k = 0; k < result.length(); k++)
+ for(int k = 0; k < result.length(); k++)
if(result[k] == ':') n_colon++;
// Generate equivalent to '::'
std::string equiv_str;
if(result[k] == ':') n_colon++;
// Generate equivalent to '::'
std::string equiv_str;
- for(
register
int k = 0; k < (8 - n_colon); k++)
+ for(int k = 0; k < (8 - n_colon); k++)
equiv_str += ":0";
equiv_str += ":";
equiv_str += ":0";
equiv_str += ":";
@@
-1043,7
+1043,7
@@
std::string functions::normalizeIP(const std::string & ip) throw(anna::RuntimeEx
// Protection: it must be seven colons:
int n_colon = 0;
// Protection: it must be seven colons:
int n_colon = 0;
- for(
register
int k = 0; k < result.length(); k++)
+ for(int k = 0; k < result.length(); k++)
if(result[k] == ':') n_colon++;
if(n_colon != 7)
if(result[k] == ':') n_colon++;
if(n_colon != 7)
@@
-1070,7
+1070,7
@@
std::string functions::normalizeIP(const std::string & ip) throw(anna::RuntimeEx
result.erase(lastPos, 1);
// Chequeo de digitos permitidos:
result.erase(lastPos, 1);
// Chequeo de digitos permitidos:
- for(
register
int k = 0; k < result.length(); k++) {
+ for(int k = 0; k < result.length(); k++) {
bool digit = isdigit(result[k]);
bool hex = ((result[k] == 'a') ||
(result[k] == 'b') ||
bool digit = isdigit(result[k]);
bool hex = ((result[k] == 'a') ||
(result[k] == 'b') ||
@@
-1342,7
+1342,7
@@
throw() {
const char* functions::codeInteger(char* result, const int n)
throw() {
int aux(htonl(n));
const char* functions::codeInteger(char* result, const int n)
throw() {
int aux(htonl(n));
-
register
char* w((char*) &aux);
+ char* w((char*) &aux);
*result = *w;
*(result + 1) = *(w + 1);
*(result + 2) = *(w + 2);
*result = *w;
*(result + 1) = *(w + 1);
*(result + 2) = *(w + 2);
@@
-1353,7
+1353,7
@@
throw() {
const char* functions::codeShort(char* result, const short int n)
throw() {
short int aux(htons(n));
const char* functions::codeShort(char* result, const short int n)
throw() {
short int aux(htons(n));
-
register
char* w((char*) &aux);
+ char* w((char*) &aux);
*result = *w;
*(result + 1) = *(w + 1);
return result;
*result = *w;
*(result + 1) = *(w + 1);
return result;
@@
-1391,7
+1391,7
@@
throw() {
int functions::decodeInteger(const char* data)
throw() {
int result;
int functions::decodeInteger(const char* data)
throw() {
int result;
-
register
char* w((char*) &result);
+ char* w((char*) &result);
*w = *data;
*(w + 1) = *(data + 1);
*(w + 2) = *(data + 2);
*w = *data;
*(w + 1) = *(data + 1);
*(w + 2) = *(data + 2);
@@
-1402,7
+1402,7
@@
throw() {
short int functions::decodeShort(const char* data)
throw() {
short int result;
short int functions::decodeShort(const char* data)
throw() {
short int result;
-
register
char* w((char*) &result);
+ char* w((char*) &result);
*w = *data;
*(w + 1) = *(data + 1);
return ntohs(result);
*w = *data;
*(w + 1) = *(data + 1);
return ntohs(result);
@@
-1459,7
+1459,7
@@
void functions::decodeIsupNumber(const char *buffer, int length, isup_number_t &
isupNumber.Digits = "";
int byte;
isupNumber.Digits = "";
int byte;
- for(
register
int k = 2; k < length; k ++) {
+ for(int k = 2; k < length; k ++) {
byte = (buffer [k] & 0x0f);
isupNumber.Digits += (byte >= 0 && byte <= 9) ? (byte + '0') : ((byte - 0xa) + 'a');
byte = (buffer [k] & 0xf0) >> 4;
byte = (buffer [k] & 0x0f);
isupNumber.Digits += (byte >= 0 && byte <= 9) ? (byte + '0') : ((byte - 0xa) + 'a');
byte = (buffer [k] & 0xf0) >> 4;
@@
-1538,7
+1538,7
@@
void functions::codeIsupNumber(const isup_number_t & isupNumber, bool calledOrCa
//std::transform(dtlc.begin(), dtlc.end(), dtlc.begin(), std::tolower);
const char *digits = dtlc.c_str();
//std::transform(dtlc.begin(), dtlc.end(), dtlc.begin(), std::tolower);
const char *digits = dtlc.c_str();
- for(
register
int k = 1; k < isupNumber.Digits.size(); k += 2) {
+ for(int k = 1; k < isupNumber.Digits.size(); k += 2) {
if(isxdigit(byte = digits [k - 1]) == 0)
throw anna::RuntimeException("functions::codeIsupNumber | Isup number 'Digits' field contains invalid digits (non hexadecimal)", ANNA_FILE_LOCATION);
if(isxdigit(byte = digits [k - 1]) == 0)
throw anna::RuntimeException("functions::codeIsupNumber | Isup number 'Digits' field contains invalid digits (non hexadecimal)", ANNA_FILE_LOCATION);