kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Made ReadParamString not depend on Maxsi::String::Substring.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2012-09-23 13:09:12 +02:00
parent b732c46bf5
commit f3988b92f3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libmaxsi/readparamstring.cpp
View file

@ -22,13 +22,20 @@
*******************************************************************************/ *******************************************************************************/
#include <libmaxsi/platform.h>
#include <libmaxsi/string.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h>
#include <string.h> #include <string.h>
#include <readparamstring.h> #include <readparamstring.h>
using namespace Maxsi; static char* Substring(const char* src, size_t offset, size_t length)
{
size_t srclen = strlen(src);
char* dest = new char[length + 1];
if ( !dest ) { return NULL; }
memcpy(dest, src + offset, length * sizeof(char));
dest[length] = 0;
return dest;
}
extern "C" bool ReadParamString(const char* str, ...) extern "C" bool ReadParamString(const char* str, ...)
{ {
@ -44,9 +51,9 @@ extern "C" bool ReadParamString(const char* str, ...)
if ( !str[namelen] ) { errno = EINVAL; goto cleanup; } if ( !str[namelen] ) { errno = EINVAL; goto cleanup; }
if ( varlen < namelen ) { errno = EINVAL; goto cleanup; } if ( varlen < namelen ) { errno = EINVAL; goto cleanup; }
size_t valuelen = varlen - 1 /*=*/ - namelen; size_t valuelen = varlen - 1 /*=*/ - namelen;
char* name = String::Substring(str, 0, namelen); char* name = Substring(str, 0, namelen);
if ( !name ) { goto cleanup; } if ( !name ) { goto cleanup; }
char* value = String::Substring(str, namelen+1, valuelen); char* value = Substring(str, namelen+1, valuelen);
if ( !value ) { delete[] name; goto cleanup; } if ( !value ) { delete[] name; goto cleanup; }
va_start(args, str); va_start(args, str);
while ( (keyname = va_arg(args, const char*)) ) while ( (keyname = va_arg(args, const char*)) )