diff src/utilops.c @ 506:fc9c8a3e1a8b

Handle the newline in DEBUG_N() macro instead of adding one in each debug message string.
author zas_
date Thu, 24 Apr 2008 00:15:03 +0000
parents a33badd85f16
children 135570a8bd96
line wrap: on
line diff
--- a/src/utilops.c	Wed Apr 23 23:52:20 2008 +0000
+++ b/src/utilops.c	Thu Apr 24 00:15:03 2008 +0000
@@ -1370,7 +1370,7 @@
 		fd = list->data;
 		list = g_list_remove(list, fd);
 
-		DEBUG_1("expunging from trash for space: %s\n", fd->name);
+		DEBUG_1("expunging from trash for space: %s", fd->name);
 		if (!unlink_file(fd->path) && !warned)
 			{
 			file_util_warning_dialog(_("Delete failed"),
@@ -1428,7 +1428,7 @@
 
 	if (!isdir(options->file_ops.safe_delete_path))
 		{
-		DEBUG_1("creating trash: %s\n", options->file_ops.safe_delete_path);
+		DEBUG_1("creating trash: %s", options->file_ops.safe_delete_path);
 		if (!options->file_ops.safe_delete_path || !mkdir_utf8(options->file_ops.safe_delete_path, 0755))
 			{
 			result = _("Could not create folder");
@@ -1443,7 +1443,7 @@
 		dest = file_util_safe_dest(fd->path);
 		if (dest)
 			{
-			DEBUG_1("safe deleting %s to %s\n", fd->path, dest);
+			DEBUG_1("safe deleting %s to %s", fd->path, dest);
 			success = move_file(fd->path, dest);
 			}
 		else
@@ -2101,7 +2101,7 @@
 				}
 			else
 				{
-				DEBUG_1("closed by #%d\n", row);
+				DEBUG_1("closed by #%d", row);
 
 				file_dialog_close(rd->fdlg);
 				}
@@ -3183,7 +3183,7 @@
 	GList *work;
 	FileData *fail = NULL;
 
-	DEBUG_1("deltree into: %s\n", fd->path);
+	DEBUG_1("deltree into: %s", fd->path);
 
 	level++;
 	if (level > UTILITY_DELETE_MAX_DEPTH)
@@ -3213,7 +3213,7 @@
 		lfd = work->data;
 		work = work->next;
 
-		DEBUG_1("deltree child: %s\n", lfd->path);
+		DEBUG_1("deltree child: %s", lfd->path);
 
 		if (real_content && !islink(lfd->path))
 			{
@@ -3233,7 +3233,7 @@
 		fail = file_data_ref(fd);
 		}
 
-	DEBUG_1("deltree done: %s\n", fd->path);
+	DEBUG_1("deltree done: %s", fd->path);
 
 	return fail;
 }
@@ -3280,7 +3280,7 @@
 			fd = work->data;
 			work = work->next;
 
-			DEBUG_1("deltree unlink: %s\n", fd->path);
+			DEBUG_1("deltree unlink: %s", fd->path);
 
 			if (islink(fd->path))
 				{