Re: 2.0.3 release candidate 1

On 2012-02-03 23:43, Gilles Espinasse wrote:

> I looked at zlib-1.2.5 =>  1.2.6 upgrade.
>
> Diffing the entire build log_i486, I only saw 2 new warnings
> gcc -DPACKAGE_NAME=\"module-init-tools\" -DPACKAGE_TARNAME=\"module-init-too
> ls\" -DPACKAGE_VERSION=\"3.16\" -DPACKAGE_STRING=\"module-init-tools\
> 3.16\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"module-init-t
> ools\" -DVERSION=\"3.16\" -DCONFIG_USE_ZLIB=1 -I. -I..     -Os -march=i486 -
> mtune=pentium -pipe -fomit-frame-pointer -Wunused -Wall -MT
> zlibsupport.o -MD -MP -MF .deps/zlibsupport.Tpo -c -o zlibsupport.o
> ../zlibsupport.c
> ../zlibsupport.c: In function 'grab_contents':
> ../zlibsupport.c:30: warning: passing argument 1 of 'gzread' from
> incompatible pointer type
> /usr/include/zlib.h:1290: note: expected 'gzFile' but argument is of type
> 'struct gzFile_s **'
> ../zlibsupport.c: In function 'grab_file':
> ../zlibsupport.c:56: warning: passing argument 1 of 'grab_contents' from
> incompatible pointer type
> ../zlibsupport.c:23: note: expected 'struct gzFile_s **' but argument is of
> type 'gzFile'
>
> I tested running module-init-tools test suite and this is still a success.
> Looking at the test suite log, there is more warnings :
> gcc -DPACKAGE_NAME=\"module-init-tools\" -DPACKAGE_TARNAME=\"module-init-too
> ls\" -DPACKAGE_VERSION=\"3.16\" -DPACKAGE_STRING=\"module-init-tools\
> 3.16\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"module-init-t
> ools\" -DVERSION=\"3.16\" -DCONFIG_USE_ZLIB=1 -I. -I..     -Os -march=i486 -
> mtune=pentium -pipe -fomit-frame-pointer -Wunused -Wall -MT
> zlibsupport.o -MD -MP -MF .deps/zlibsupport.Tpo -c -o zlibsupport.o
> ../zlibsupport.c
> ../zlibsupport.c: In function 'grab_contents':
> ../zlibsupport.c:30: warning: passing argument 1 of 'gzread' from
> incompatible pointer type
> /usr/include/zlib.h:1290: note: expected 'gzFile' but argument is of type
> 'struct gzFile_s **'
> ../zlibsupport.c: In function 'grab_file':
> ../zlibsupport.c:56: warning: passing argument 1 of 'grab_contents' from
> incompatible pointer type
> ../zlibsupport.c:23: note: expected 'struct gzFile_s **' but argument is of
> type 'gzFile'
>
> We may be alone running module-init-tools tests with --enable-zlib-dynamic
> as for that we need to modify the test script. But as that's what we use on
> installed machine, that should be the right thing to do.
>
> I will report the module-init-tools warnings with 1.2.6.

Patch below fixes compiler complaining, have not checked yet if it works OK.


Not sure whether module-init-tools will change, everybody seems to be 
going with kmod...  We'd probably need to change too, though sure if 
kmod is ready enough.


Olaf



Index: lfs/module-init-tools
===================================================================
--- lfs/module-init-tools	(revision 6310)
+++ lfs/module-init-tools	(working copy)
@@ -85,6 +85,7 @@
  $(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst 
%,$(DIR_DL)/%,$(objects))
  	@$(PREBUILD)
  	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i 
$(DIR_PATCHES)/$(THISAPP)_gzFile-typedef.patch

  ifeq "$(RUNNING_TEST)" "yes"
  	# A special build is compiled for testing, not suitable for normal 
usage and cleaned at end

Index: src/patches/module-init-tools-3.16_gzFile-typedef.patch
===================================================================
--- src/patches/module-init-tools-3.16_gzFile-typedef.patch	(revision 0)
+++ src/patches/module-init-tools-3.16_gzFile-typedef.patch	(revision 0)
@@ -0,0 +1,11 @@
+--- module-init-tools-3.16/zlibsupport.orig	2012-02-04 
10:23:04.000000000 +0100
++++ module-init-tools-3.16/zlibsupport.c	2012-02-04 10:25:47.000000000 
+0100
+@@ -20,7 +20,7 @@
+ #ifdef CONFIG_USE_ZLIB
+ #include <zlib.h>
+
+-void *grab_contents(gzFile *gzfd, unsigned long *size)
++void *grab_contents(gzFile gzfd, unsigned long *size)
+ {
+ 	unsigned int max = 16384;
+ 	void *buffer = NOFAIL(malloc(max));

------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2