X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ED2KLink.cpp;h=5f33ce872b97c714975bb23ffccfa84b9a96096e;hb=123951f2009e356a8c4a2f834252c5d974c36558;hp=05b8d97c1e06f3f8f547882c15efd3b8620106a6;hpb=0660d2d3d6f00d0c57d373893cc375408adc155f;p=ecparse.git diff --git a/ED2KLink.cpp b/ED2KLink.cpp index 05b8d97..5f33ce8 100644 --- a/ED2KLink.cpp +++ b/ED2KLink.cpp @@ -6,7 +6,6 @@ #include #include #include "ED2KLink.h" -#include "GrowingBuffer.h" #include "GlobalSettings.h" static int getDigits(size_t number) { @@ -55,7 +54,7 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) { int hashIndex; unsigned char hash[16]; char* pipeIndex; - GrowingBuffer growingBuffer; + int stringLength; GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] trying to parse “%s”...\n", __FILE__, __LINE__, buffer); @@ -69,10 +68,10 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) { GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] expected pipe character (‘|’) but found none.\n", __FILE__, __LINE__); return NULL; } - growingBuffer.write(tempBuffer, (char*) pipeIndex - tempBuffer); - filename = (char*) malloc(growingBuffer.getLimit() + 1); - growingBuffer.read(filename, growingBuffer.getLimit()); - growingBuffer.clear(); + stringLength = (char*) pipeIndex - tempBuffer; + filename = (char*) malloc(stringLength + 1); + memcpy(filename, tempBuffer, stringLength); + sizeString[stringLength] = '\0'; tempBuffer = pipeIndex + 1; GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] parsed filename: “%s”.\n", __FILE__, __LINE__, filename); @@ -82,10 +81,10 @@ ED2KLink* ED2KLink::parseED2KLink(const char* buffer) { GlobalSettings::isVerbose() && fprintf(stderr, "[%s:%d] expected pipe character (‘|’) but found none.\n", __FILE__, __LINE__); return NULL; } - growingBuffer.write(tempBuffer, (char*) pipeIndex - tempBuffer); - sizeString = (char*) malloc(growingBuffer.getLimit() + 1); - growingBuffer.read(sizeString, growingBuffer.getLimit()); - growingBuffer.clear(); + stringLength = (char*) pipeIndex - tempBuffer; + sizeString = (char*) malloc(stringLength + 1); + memcpy(sizeString, tempBuffer, stringLength); + sizeString[stringLength] = '\0'; tempBuffer = pipeIndex + 1; size = atol(sizeString);