Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Name variables more descriptive. #4169

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Name variables more descriptive. #4169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
052d9c8
Name variables more descriptive.
Rot127 Jan 31, 2024
11930a8
Add docs to rz_str_replace
Rot127 Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion librz/include/rz_util/rz_str.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ RZ_API RzList /*<char *>*/ *rz_str_split_duplist(const char *str, const char *c,
RZ_API RzList /*<char *>*/ *rz_str_split_duplist_n(const char *str, const char *c, int n, bool trim);
RZ_API RZ_OWN RzList /*<char *>*/ *rz_str_split_duplist_n_regex(RZ_NONNULL const char *_str, RZ_NONNULL const char *r, int n, bool trim);
RZ_API size_t *rz_str_split_lines(char *str, size_t *count);
RZ_API char *rz_str_replace(char *str, const char *key, const char *val, int g);
RZ_API RZ_OWN char *rz_str_replace(RZ_OWN char *str, const char *key, const char *val, int g);
RZ_API char *rz_str_replace_icase(char *str, const char *key, const char *val, int g, int keep_case);
RZ_API char *rz_str_replace_in(char *str, ut32 sz, const char *key, const char *val, int g);
#define rz_str_cpy(x, y) memmove((x), (y), strlen(y) + 1);
Expand Down
51 changes: 31 additions & 20 deletions librz/util/str.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,48 +1136,59 @@ RZ_API char *rz_str_appendch(char *x, char y) {
return rz_str_append(x, b);
}

RZ_API char *rz_str_replace(char *str, const char *key, const char *val, int g) {
/**
* \brief In-place replacement of string \p key with \p val in \p str.
* In case of realloc \p str is freed and NULL is returned.
*
* \param str The string to replace the sub-string in.
* \param key The sub-string to replace.
* \param val The sub-string to replace \p key with.
* \param g If 'i' it does an "ignore case" replacement. If 0 it replaces only the first occurance.
*
* \return Pointer to the given string but replaced sub_strings. And NULL in case of failure.
*/
RZ_API RZ_OWN char *rz_str_replace(RZ_OWN char *str, const char *key, const char *val, int g) {
if (g == 'i') {
return rz_str_replace_icase(str, key, val, g, true);
}
rz_return_val_if_fail(str && key && val, NULL);

int off, i, slen;
char *newstr, *p = str;
int klen = strlen(key);
int vlen = strlen(val);
if (klen == 1 && vlen < 2) {
int key_off, i, str_len;
char *newstr, *key_ptr = str;
int key_len = strlen(key);
int val_len = strlen(val);
if (key_len == 1 && val_len < 2) {
rz_str_replace_char(str, *key, *val);
return str;
}
if (klen == vlen && !strcmp(key, val)) {
if (key_len == val_len && !strcmp(key, val)) {
return str;
}
slen = strlen(str);
str_len = strlen(str);
char *q = str;
for (;;) {
p = strstr(q, key);
if (!p) {
key_ptr = strstr(q, key);
if (!key_ptr) {
break;
}
off = (int)(size_t)(p - str);
if (vlen != klen) {
int tlen = slen - (off + klen);
slen += vlen - klen;
if (vlen > klen) {
newstr = realloc(str, slen + 1);
key_off = (int)(size_t)(key_ptr - str);
if (val_len != key_len) {
int tail_len = str_len - (key_off + key_len);
str_len += val_len - key_len;
if (val_len > key_len) {
newstr = realloc(str, str_len + 1);
if (!newstr) {
eprintf("realloc fail\n");
RZ_FREE(str);
break;
}
str = newstr;
}
p = str + off;
memmove(p + vlen, p + klen, tlen + 1);
key_ptr = str + key_off;
memmove(key_ptr + val_len, key_ptr + key_len, tail_len + 1);
}
memcpy(p, val, vlen);
i = off + vlen;
memcpy(key_ptr, val, val_len);
i = key_off + val_len;
q = str + i;
if (!g) {
break;
Expand Down
Loading