applied changes from 8152fe0104bfcc5da3dda8b81badd6f63f9532b8 release-2.2.2

Sun, 21 Oct 2007 04:42:20 +0000

author
Luke Schierer <lschiere@pidgin.im>
date
Sun, 21 Oct 2007 04:42:20 +0000
branch
release-2.2.2
changeset 20236
d48d9b427e0a
parent 20235
825d9a540984
child 20237
4fdec005d0b4

applied changes from 8152fe0104bfcc5da3dda8b81badd6f63f9532b8
through e9e74094baa29c6f5589385507221a2502b817fb

libpurple/plugins/log_reader.c file | annotate | diff | comparison | revisions
--- a/libpurple/plugins/log_reader.c	Sun Oct 21 04:40:07 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Sun Oct 21 04:42:20 2007 +0000
@@ -114,7 +114,7 @@
 						continue;
 					}
 
-					rd = fread(contents, 56, 1, handle) == 0;
+					rd = fread(contents, 1, 56, handle) == 0;
 					fclose(handle);
 					contents[rd] = '\0';
 
@@ -176,7 +176,7 @@
 						continue;
 					}
 
-					rd = fread(contents, 13, 1, handle);
+					rd = fread(contents, 1, 13, handle);
 					fclose(handle);
 					contents[rd] = '\0';
 
@@ -1439,7 +1439,7 @@
 
 	file = g_fopen(data->path, "rb");
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(read, data->length, 1, file);
+	data->length = fread(read, 1, data->length, file);
 	fclose(file);
 
 	if (read[data->length-1] == '\n') {
@@ -1938,7 +1938,7 @@
 	contents = g_malloc(data->length + 2);
 
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(contents, data->length, 1, file);
+	data->length = fread(contents, 1, data->length, file);
 	fclose(file);
 
 	contents[data->length] = '\n';
@@ -2331,7 +2331,7 @@
 	g_return_val_if_fail(file != NULL, g_strdup(""));
 	
 	fseek(file, data->offset, SEEK_SET);
-	data->length = fread(contents, data->length, 1, file);
+	data->length = fread(contents, 1, data->length, file);
 	fclose(file);
 
 	contents[data->length] = '\n';

mercurial