archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename BLI_strescape to BLI_str_escape

Browse Source 
Prepare for `BLI_str_unescape` which doesn't read well
without the separator.
This commit is contained in:
Campbell Barton
2020-12-10 13:25:49 +11:00
parent 548e9624d0
commit 65f139117d
34 changed files with 93 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/makesrna/intern/rna_access.c
View File

@@ -6016,7 +6016,7 @@ char *RNA_path_from_ID_to_property_index(PointerRNA *ptr,
}
else {
char propname_esc[MAX_IDPROP_NAME * 2];
BLI_strescape(propname_esc, propname, sizeof(propname_esc));
BLI_str_escape(propname_esc, propname, sizeof(propname_esc));
path = BLI_sprintfN("%s[\"%s\"]%s", ptrpath, propname_esc, index_str);
}
MEM_freeN(ptrpath);
@@ -6027,7 +6027,7 @@ char *RNA_path_from_ID_to_property_index(PointerRNA *ptr,
}
else {
char propname_esc[MAX_IDPROP_NAME * 2];
BLI_strescape(propname_esc, propname, sizeof(propname_esc));
BLI_str_escape(propname_esc, propname, sizeof(propname_esc));
path = BLI_sprintfN("[\"%s\"]%s", propname_esc, index_str);
}
}
@@ -6113,7 +6113,7 @@ char *RNA_path_full_ID_py(Main *bmain, ID *id)
char id_esc[(sizeof(id->name) - 2) * 2];
BLI_strescape(id_esc, id->name + 2, sizeof(id_esc));
BLI_str_escape(id_esc, id->name + 2, sizeof(id_esc));
return BLI_sprintfN("bpy.data.%s[\"%s\"]%s%s",
BKE_idtype_idcode_to_name_plural(GS(id->name)),
@@ -7067,7 +7067,7 @@ char *RNA_property_as_string(
buf = MEM_mallocN(sizeof(char) * (length + 1), "RNA_property_as_string");
buf_esc = MEM_mallocN(sizeof(char) * (length * 2 + 1), "RNA_property_as_string esc");
RNA_property_string_get(ptr, prop, buf);
BLI_strescape(buf_esc, buf, length * 2 + 1);
BLI_str_escape(buf_esc, buf, length * 2 + 1);
MEM_freeN(buf);
BLI_dynstr_appendf(dynstr, "\"%s\"", buf_esc);
MEM_freeN(buf_esc);