From b2ee9d8b0c023750a1d9ad2afed8b1c3def454b1 Mon Sep 17 00:00:00 2001
From: Jonathan Beck
Date: Sun, 17 Aug 2008 21:28:09 +0200
Subject: Merge master into fixes.

---
 src/AFC.c   | 4 ++--
 src/plist.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AFC.c b/src/AFC.c
index 67d14f9..06e9952 100644
--- a/src/AFC.c
+++ b/src/AFC.c
@@ -715,9 +715,9 @@ int afc_write_file(AFClient *client, AFCFile *file, const char *data, int length
 	if (!client ||!client->afc_packet || !client->connection || !file) return -1;
 	
 	afc_lock(client);
-	
+
 	if (debug) fprintf(stderr, "afc_write_file: Write length: %i\n", length);
-	
+
 	// Divide the file into segments.
 	for (i = 0; i < segments; i++) {
 		// Send the segment
diff --git a/src/plist.c b/src/plist.c
index ed09354..e64cff2 100644
--- a/src/plist.c
+++ b/src/plist.c
@@ -49,7 +49,7 @@ char* format_string(const char* buf, int cols, int depth)
 	int i = 0;
 	int j = 0;
 
-	assert(cols > 0);
+	assert(cols >= 0);
 	assert(depth >= 0);
 
 	// Inserts new lines and tabs at appropriate locations
-- 
cgit v1.1-32-gdbae