-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
//
// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
//
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// copyright notice, this list of conditions and the following disclaimer
// in the documentation and/or other materials provided with the
// distribution.
-// * Neither the name of Google Inc. nor the names of its
+// * Neither the name of the copyright holder nor the names of its
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
}
/**
- * Obtiene el valor original de una cadena obtenido con #asHexString (const DataBlock&).
- * \param hexString Cadena que contiene el búfer.
- * \param target Bloque de datos sobre el que decodificar la cadena.
- * \return El bloque de datos original correspondiente a la cadena recibida.
+ * Gets the original value obtained with #asHexString (const DataBlock&).
+ * \param hexString String which contains the buffer. The format is an hexadecimal octet sequence representation (i.e. 'af012fb3', with even number of digits).
+ * The input shall be preprocessed to comply with that format (e.g. colon or any other non-hex digit must be removed).
+ * \param target DataBlock for string decode.
+ * \return DataBlock corresponding to the provided string.
*/
//static
DataBlock& functions::fromHexString(const std::string& hexString, DataBlock& target)
throw(RuntimeException) {
+
if((hexString.length() % 2) != 0)
throw RuntimeException("functions::fromHexString | Invalid string length", ANNA_FILE_LOCATION);
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);
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((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 += " ";
}
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;
}
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)) {
- for(register int k = 0; k < ou_repeat; k++) result += filler;
+ for(int k = 0; k < ou_repeat; k++) result += filler;
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 += " ";
- 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";
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;
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 : '.');
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);
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;
// 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)
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') ||
// 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)
// 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;
- for(register int k = 0; k < (8 - n_colon); k++)
+ for(int k = 0; k < (8 - n_colon); k++)
equiv_str += ":0";
equiv_str += ":";
// 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)
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') ||
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);
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;
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);
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);
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;
//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);