SOURCES: module-init-tools-shared-zlib.patch, module-init-tools-in...

[glen]

Author: glen                         Date: Sat Dec 15 16:50:56 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- revert (moved to DEVEL)

---- Files affected:
SOURCES:
   module-init-tools-shared-zlib.patch (1.5 -> 1.6) , module-init-tools-insmod-zlib.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/module-init-tools-shared-zlib.patch
diff -u SOURCES/module-init-tools-shared-zlib.patch:1.5 SOURCES/module-init-tools-shared-zlib.patch:1.6
--- SOURCES/module-init-tools-shared-zlib.patch:1.5	Sat Dec 15 17:47:52 2007
+++ SOURCES/module-init-tools-shared-zlib.patch	Sat Dec 15 17:50:50 2007
@@ -1,5 +1,5 @@
---- module-init-tools-3.0-pre9/configure.ac.orig	2004-01-30 05:15:25.000000000 +0100
-+++ module-init-tools-3.0-pre9/configure.ac	2004-01-30 23:08:59.729518344 +0100
+--- module-init-tools-3.0-pre9/configure.in.orig	2004-01-30 05:15:25.000000000 +0100
++++ module-init-tools-3.0-pre9/configure.in	2004-01-30 23:08:59.729518344 +0100
 @@ -6,19 +6,20 @@
  
  # If zlib is required, libz must be linked static, modprobe is in

================================================================
Index: SOURCES/module-init-tools-insmod-zlib.patch
diff -u SOURCES/module-init-tools-insmod-zlib.patch:1.3 SOURCES/module-init-tools-insmod-zlib.patch:1.4
--- SOURCES/module-init-tools-insmod-zlib.patch:1.3	Sat Dec 15 17:47:53 2007
+++ SOURCES/module-init-tools-insmod-zlib.patch	Sat Dec 15 17:50:50 2007
@@ -1,5 +1,5 @@
---- module-init-tools-3.3-pre11/insmod.c~	2007-12-15 18:09:53.000000000 +0200
-+++ module-init-tools-3.3-pre11/insmod.c	2007-12-15 18:14:02.316183717 +0200
+--- module-init-tools-3.2-pre9/insmod.c.orig	2005-03-14 16:19:11.000000000 +0100
++++ module-init-tools-3.2-pre9/insmod.c	2005-10-18 00:48:15.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <errno.h>
  #include <asm/unistd.h>
@@ -8,14 +8,14 @@
  #include "backwards_compat.c"
  
  #define streq(a,b) (strcmp((a),(b)) == 0)
-@@ -58,48 +58,6 @@
+@@ -57,36 +58,6 @@
  	}
  }
  
 -static void *grab_file(const char *filename, unsigned long *size)
 -{
 -	unsigned int max = 16384;
--	int ret, fd, err_save;
+-	int ret, fd;
 -	void *buffer = malloc(max);
 -	if (!buffer)
 -		return NULL;
@@ -31,27 +31,15 @@
 -	*size = 0;
 -	while ((ret = read(fd, buffer + *size, max - *size)) > 0) {
 -		*size += ret;
--		if (*size == max) {
--			void *p;
--
--			p = realloc(buffer, max *= 2);
--			if (!p)
--				goto out_error;
--			buffer = p;
--		}
+-		if (*size == max)
+-			buffer = realloc(buffer, max *= 2);
+-	}
+-	if (ret < 0) {
+-		free(buffer);
+-		buffer = NULL;
 -	}
--	if (ret < 0)
--		goto out_error;
--
 -	close(fd);
 -	return buffer;
--
--out_error:
--	err_save = errno;
--	free(buffer);
--	close(fd);
--	errno = err_save;
--	return NULL;
 -}
 -
  int main(int argc, char *argv[])
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-shared-zlib.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/module-init-tools-insmod-zlib.patch?r1=1.3&r2=1.4&f=u