--- libelwix/inc/elwix/astr.h 2014/02/12 15:24:50 1.4.12.1 +++ libelwix/inc/elwix/astr.h 2024/10/26 14:40:36 1.8.48.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: astr.h,v 1.4.12.1 2014/02/12 15:24:50 misho Exp $ +* $Id: astr.h,v 1.8.48.1 2024/10/26 14:40:36 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2014 +Copyright 2004 - 2024 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -146,17 +146,49 @@ ait_val_t *str_Hex2Dig(const char *psLine); * !=0 Allocated new converted string (must be e_free()) */ char *str_Dig2Hex(ait_val_t *digz); +/* + * str_Dig2Hex2() - Convert from digit array to Hex string + * + * @digz = Digits array + * @diglen = Array length + * return: NULL nothing to do or error; + * !=0 Allocated new converted string (must be e_free()) +*/ +char *str_Dig2Hex2(u_char *digz, int diglen); /* - * str_getString() - Get string from data buffer + * str_getString() - Get NULL delimited string from data buffer * - * @data = Data buffer + * @data = Const data buffer * @dlen = Data length * @next = Return next position after string if !=NULL * return: -1 error or size of string */ int str_getString(const unsigned char * __restrict data, int dlen, char ** __restrict next); +/* + * str_getString2() - Get string from data buffer with delimiter + * + * @data = Data buffer + * @dlen = Data length + * @delim = Data delimiter + * @next = Return next position after delimited string if !=NULL + * return: -1 error or size of string + */ +int str_getString2(char * __restrict data, int dlen, char delim, + char ** __restrict next); + +/* + * str_find2replace() - Search find string into data and replace + * + * @data = input string + * @find = search for string + * @replace = replace to string. If it is NULL then deletes found search string + * @str = new produced allocate string. If it is NULL then just return found occurances of find + * @mlen = allocated memory size for new string + * return: -1 error, 0 not found or >0 how many occurances we have for find string + */ +int str_find2replace(const char *data, const char *find, const char *replace, char **str, int *mlen); #endif