mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-29 03:02:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ticket #415 (trivial optimization in src/file.c::panel_operate())

Browse Source 
This patch contains the following trivial optimizations:

 * merged two identical "dest_dir_ = g_strdup (dest_dir)" ops.
 * simplified check for trailing '/' (no need to strcmp 1-char string).
 * since g_free (NULL) is safe, merged two separate "if empty string then bail out" code paths.
 * fixed wording in a comment.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2009-06-18 14:51:05 +03:00
parent 5ce3acc134
commit df256dbaf6
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/file.c
View File

@ -1804,19 +1804,18 @@ panel_operate (void *source_panel, FileOperation operation,
else
dest_dir = panel->cwd;
/*
* Add trailing backslash only when do non-locally ops.
* Add trailing backslash only when do non-local ops.
* It saves user from occasional file renames (when destination
* dir is deleted)
*/
if (force_single)
if (!force_single
&& dest_dir[0]
&& dest_dir[strlen(dest_dir)-1] != PATH_SEP) {
/* add trailing separator */
dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0);
} else {
/* just copy */
dest_dir_ = g_strdup (dest_dir);
else
/* add trailing separator */
if (*dest_dir && strcmp(&dest_dir[strlen(dest_dir)-1], PATH_SEP_STR)) {
dest_dir_ = g_strconcat (dest_dir, PATH_SEP_STR, (char*)0);
} else {
dest_dir_ = g_strdup (dest_dir);
}
if (!dest_dir_) {
file_op_context_destroy (ctx);
@ -1828,11 +1827,7 @@ panel_operate (void *source_panel, FileOperation operation,
single_entry, &do_bg);
g_free(dest_dir_);
if (!dest) {
file_op_context_destroy (ctx);
return 0;
}
if (!*dest) {
if (!dest || !dest[0]) {
file_op_context_destroy (ctx);
g_free (dest);
return 0;