summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jonathan Beck2008-08-17 21:28:09 +0200
committerGravatar Jonathan Beck2008-08-21 19:10:17 +0200
commitb2ee9d8b0c023750a1d9ad2afed8b1c3def454b1 (patch)
tree65b80160862b976e93e7bc47772ba27dff653422
parentae11cc812ed4e4ec011a960b77973e66a8694d10 (diff)
downloadlibimobiledevice-b2ee9d8b0c023750a1d9ad2afed8b1c3def454b1.tar.gz
libimobiledevice-b2ee9d8b0c023750a1d9ad2afed8b1c3def454b1.tar.bz2
Merge master into fixes.
-rw-r--r--src/AFC.c4
-rw-r--r--src/plist.c2
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