Mercurial > geeqie.yaz

changeset 921:b416159a5820

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy up.
author zas_
date Wed, 23 Jul 2008 12:46:35 +0000
parents 408879d2a660
children 826d5862f671
files src/utilops.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/utilops.c	Wed Jul 23 12:45:59 2008 +0000
+++ b/src/utilops.c	Wed Jul 23 12:46:35 2008 +0000
@@ -1723,7 +1723,8 @@
 
 	if (ok)
 		{
-		if ((ok = file_data_sc_add_ci_delete(fd)))
+		ok = file_data_sc_add_ci_delete(fd);
+		if (ok)
 			{
 			ud->content_list = g_list_prepend(ud->content_list, fd);
 			}
@@ -1739,7 +1740,6 @@
 		work = work->next;
 
 		ok = file_util_delete_dir_empty_path(ud, lfd, level);
-
 		}
 
 	work = flist;
@@ -1752,7 +1752,8 @@
 
 		DEBUG_1("deltree child: %s", lfd->path);
 
-		if ((ok = file_data_sc_add_ci_delete(lfd)))
+		ok = file_data_sc_add_ci_delete(lfd);
+		if (ok)
 			{
 			ud->content_list = g_list_prepend(ud->content_list, lfd);
 			}
@@ -1992,7 +1993,7 @@
 		
 		g_assert(strncmp(fd->path, ud->dir_fd->path, orig_len) == 0);
 		
-		np = g_strdup_printf("%s%s", new_path, fd->path + orig_len);
+		np = g_strconcat(new_path, fd->path + orig_len, NULL);
 		
 		ok = file_data_sc_add_ci_rename(fd, np);
 		
@@ -2017,6 +2018,7 @@
 			file_data_sc_free_ci(fd);
 			}
 		}
+
 	return ok;
 }