SOURCES: module-init-tools-insmod-zlib.patch - merged with DEVEL

havner havner at pld-linux.org
Sat Nov 12 01:46:58 CET 2005


Author: havner                       Date: Sat Nov 12 00:46:58 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged with DEVEL

---- Files affected:
SOURCES:
   module-init-tools-insmod-zlib.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/module-init-tools-insmod-zlib.patch
diff -u SOURCES/module-init-tools-insmod-zlib.patch:1.1 SOURCES/module-init-tools-insmod-zlib.patch:1.2
--- SOURCES/module-init-tools-insmod-zlib.patch:1.1	Sat Jul 17 18:07:52 2004
+++ SOURCES/module-init-tools-insmod-zlib.patch	Sat Nov 12 01:46:52 2005
@@ -1,6 +1,5 @@
-diff -urN module-init-tools-3.0.org/insmod.c module-init-tools-3.0/insmod.c
---- module-init-tools-3.0.org/insmod.c	2004-07-17 19:56:16.102393536 +0200
-+++ module-init-tools-3.0/insmod.c	2004-07-17 19:57:26.913628592 +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>
@@ -9,7 +8,7 @@
  #include "backwards_compat.c"
  
  #define streq(a,b) (strcmp((a),(b)) == 0)
-@@ -57,34 +58,6 @@
+@@ -57,36 +58,6 @@
  	}
  }
  
@@ -18,6 +17,8 @@
 -	unsigned int max = 16384;
 -	int ret, fd;
 -	void *buffer = malloc(max);
+-	if (!buffer)
+-		return NULL;
 -
 -	if (streq(filename, "-"))
 -		fd = dup(STDIN_FILENO);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/module-init-tools-insmod-zlib.patch?r1=1.1&r2=1.2&f=u




More information about the pld-cvs-commit mailing list