Changed function name

Author: gistrec

src/Receiver.cpp

@@ -33,7 +33,7 @@ void checkParts() {
     while (ttl && emptyParts.size() > 0) {
         for (auto index : emptyParts) {
             snprintf(buffer, 7, "RESEND");                                //
-            Utils::writeBytesFromInt(buffer + 6, index, 4);               // Create request packet
+            Utils::writeBytesFromNumber(buffer + 6, index, 4);            // Create request packet
             sendto(_socket, buffer, 10, 0, (sockaddr*) &broadcast_address,//
                    sizeof(broadcast_address));                            //
 
@@ -69,16 +69,16 @@ void run(cxxopts::ParseResult &options) {
         ttl = ttl_max; // Update ttl
 
         if (strncmp(buffer, "NEW_PACKET", 10) == 0) {
-            file_length = Utils::getIntFromBytes(buffer + 10, 4); // Read section "file length"
+            file_length = Utils::getNumberFromBytes(buffer + 10, 4); // Read section "file length"
 
             file = new char[file_length];
             memset(file, 0, file_length);
 
             std::cout << "Receive information about new file size: " << file_length << std::endl;
             std::cout << "Number of parts: " << int((float)file_length / (float)mtu + 0.5) << std::endl;
         } else if (strncmp(buffer, "TRANSFER", 8) == 0) {
-            int part = Utils::getIntFromBytes(buffer +  8, 4); // Read section "index"
-            int size = Utils::getIntFromBytes(buffer + 12, 4); // Read section "size"
+            int part = Utils::getNumberFromBytes(buffer +  8, 4); // Read section "index"
+            int size = Utils::getNumberFromBytes(buffer + 12, 4); // Read section "size"
             parts.insert(part);
             std::cout << "Receive " << part << " part with size " << size << std::endl;
 

src/Sender.cpp

@@ -16,8 +16,8 @@ void sendPart(int part_index) {
     if (packet_length > mtu) packet_length = mtu;        //
 
     snprintf(buffer, 9, "TRANSFER");
-    Utils::writeBytesFromInt(buffer +  8, (size_t)part_index,    4);                 // Write section "number"
-    Utils::writeBytesFromInt(buffer + 12, (size_t)packet_length, 4);                 // Write section "length"
+    Utils::writeBytesFromNumber(buffer +  8, (size_t)part_index,    4);               // Write section "number"
+    Utils::writeBytesFromNumber(buffer + 12, (size_t)packet_length, 4);               // Write section "length"
     memcpy(buffer + 16, (void *)(intptr_t)(file + part_index * mtu), packet_length); // Write section "data"
 
     // Sending part to the broadcast address
@@ -49,7 +49,7 @@ void run(cxxopts::ParseResult &options) {
     std::cout << "Ok: File successfully copied to RAM" << std::endl;
 
     snprintf(buffer, 11, "NEW_PACKET");                            //
-    Utils::writeBytesFromInt(buffer + 10, file_length, 4);         // Sending information
+    Utils::writeBytesFromNumber(buffer + 10, file_length, 4);      // Sending information
     sendto(_socket, buffer, 14, 0, (sockaddr*) &broadcast_address, // about size of new file
            sizeof(broadcast_address));                             //
 
@@ -85,7 +85,7 @@ void run(cxxopts::ParseResult &options) {
         }
 
         if (strncmp(buffer, "RESEND", 6) == 0) {
-            int part = Utils::getIntFromBytes(buffer + 6, 4);
+            int part = Utils::getNumberFromBytes(buffer + 6, 4);
 
             auto now      = std::chrono::system_clock::now();
             auto now_ms   = std::chrono::time_point_cast<std::chrono::seconds>(now);

src/Utils.hpp

@@ -37,13 +37,13 @@ namespace Utils {
      * @param  buffer - bytes array
      * @param  count  - bytes count
      */
-    int getIntFromBytes(char* buffer, int count) {
-        int value = 0;
+    size_t getNumberFromBytes(char* buffer, int count) {
+        size_t number = 0;
         for (int i = 0; i < count; i++) {
-            value = value << 8;
-            value = value | (buffer[i] & 0xFF);
+            number = number << 8;
+            number = number | (buffer[i] & 0xFF);
         }
-        return value;
+        return number;
     }
 
     /**
@@ -52,9 +52,9 @@ namespace Utils {
      * @param value  - number
      * @param count  - count bytes
      */
-    void writeBytesFromInt(char* buffer, size_t value, int count) {
+    void writeBytesFromNumber(char* buffer, size_t number, int count) {
         for (int i = 0; i < count; i++) {
-            buffer[count - i - 1] = (char) (value >> (i * 8));
+            buffer[count - i - 1] = (char) (number >> (i * 8));
         }
     }
 }