mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(vfs_path_to_str_flags): create recode_buffer only when required. 

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2023-04-09 21:01:46 +03:00
parent 97e8cbc8d6
commit 8455ff8dfd
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vfs/path.c
View File

@ -631,7 +631,9 @@ vfs_path_to_str_flags (const vfs_path_t * vpath, int elements_count, vfs_path_fl
{
int element_index;
GString *buffer;
GString *recode_buffer;
#ifdef HAVE_CHARSET
GString *recode_buffer = NULL;
#endif
if (vpath == NULL)
return NULL;
@ -643,7 +645,6 @@ vfs_path_to_str_flags (const vfs_path_t * vpath, int elements_count, vfs_path_fl
elements_count = vfs_path_elements_count (vpath) + elements_count;
buffer = g_string_new ("");
recode_buffer = g_string_new ("");
for (element_index = 0; element_index < elements_count; element_index++)
{
@ -682,9 +683,14 @@ vfs_path_to_str_flags (const vfs_path_t * vpath, int elements_count, vfs_path_fl
g_string_append (buffer, VFS_ENCODING_PREFIX);
g_string_append (buffer, element->encoding);
}
if (recode_buffer == NULL)
recode_buffer = g_string_sized_new (32);
else
g_string_set_size (recode_buffer, 0);
str_vfs_convert_from (element->dir.converter, element->path, recode_buffer);
vfs_append_from_path (recode_buffer->str, is_relative);
g_string_set_size (recode_buffer, 0);
}
else
#endif
@ -692,7 +698,12 @@ vfs_path_to_str_flags (const vfs_path_t * vpath, int elements_count, vfs_path_fl
vfs_append_from_path (element->path, is_relative);
}
}
g_string_free (recode_buffer, TRUE);
#ifdef HAVE_CHARSET
if (recode_buffer != NULL)
g_string_free (recode_buffer, TRUE);
#endif
return g_string_free (buffer, FALSE);
}