Warning fixes

Sun Jul 31 03:39:54 EST 2005

On Thu, Jul 21, 2005 at 10:56:28AM +0200, Stefan Dirsch wrote:
> On Mon, Jul 18, 2005 at 02:50:16PM +0200, Stefan Dirsch wrote:
> > Hi
> > 
> > Attached you find patches, which fix warnings, which are treated as
> > fatal within a SuSE build.
> > 
> > 
> > lib/Xfont/src/builtins/render.c
> > lib/Xfont/src/builtins/fpe.c
> > - warning: control reaches end of non-void function
> > lib/ICE/src/Makefile.am
> > lib/X11/modules/im/ximcp/Makefile.am
> > lib/FS/src/Makefile.am
> > lib/X11/src/Makefile.am
> > - warning: assignment makes pointer from integer without a cast
> >   (missing Defines taken from Imakefiles in monolithic Tree)
> > xc/lib/lbxutil/delta/lbxdelta.c
> > - warning: implicit declaration of function 'memcpy'
> > app/lbxproxy/Makefile.am
> > app/xfs/Makefile.am
> > - warning: assignment makes pointer from integer without a cast
> >   (missing Defines taken from Imakefiles in monolithic Tree)
> > app/fonttosfnt/Makefile.am
> > app/xedit/lisp/write.c
> > app/xedit/lisp/require.c
> > - warning: implicit declaration of function 'snprintf'
> > xserver/xorg/hw/xfree86/i2c/fi1236.c
> > - warning: control reaches end of non-void function
> > app/mkfontscale/Makefile.am
> > app/xedit/lisp/core.c
> > lib/Xmu/src/Makefile.am
> > - warning: implicit declaration of function 'snprintf'
> 
> Since there has been changes in CVS meanwhile I remade the patch and
> attach it. Hopefully it can be applied after discussing it.

Since CVS access has not been granted by sitewranglers at freedesktop yet
(#3873), I attach my current patch again.

Stefan

Public Key available
------------------------------------------------------
Stefan Dirsch (Res. & Dev.)   SUSE LINUX Products GmbH
Tel: 0911-740 53 0            Maxfeldstraße 5
FAX: 0911-740 53 479          D-90409 Nürnberg
http://www.suse.de            Germany 
------------------------------------------------------
-------------- next part --------------

--- lib/Xfont/src/builtins/render.c.orig	2005-07-10 11:43:05.000000000 +0000
+++ lib/Xfont/src/builtins/render.c	2005-07-18 08:25:49.000000000 +0000
@@ -103,7 +103,7 @@
 
 #define numRenderers	(sizeof renderers / sizeof renderers[0])
 
-BuiltinRegisterFontFileFunctions()
+void BuiltinRegisterFontFileFunctions()
 {
     int	i;
     for (i = 0; i < numRenderers; i++)
--- lib/Xfont/src/builtins/fpe.c.orig	2005-07-10 11:43:05.000000000 +0000
+++ lib/Xfont/src/builtins/fpe.c	2005-07-18 08:27:37.000000000 +0000
@@ -74,7 +74,7 @@
     return Successful;
 }
 
-BuiltinRegisterFpeFunctions()
+void BuiltinRegisterFpeFunctions()
 {
     BuiltinRegisterFontFileFunctions ();
 
--- /usr/local/src/xorg/xorg-modular/lib/ICE/src/Makefile.am	2005-05-17 23:25:15.000000000 +0200
+++ lib/ICE/src/Makefile.am	2005-06-21 12:47:28.000000000 +0200
@@ -1,6 +1,7 @@
 lib_LTLIBRARIES=libICE.la
 
-AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS)
+AM_CFLAGS= -I${top_srcdir}/include $(ICE_CFLAGS) $(XTRANS_CFLAGS) \
+           -DICE_t -DTRANS_CLIENT -DTRANS_SERVER
 
 libICE_la_LDFLAGS = -version-number 6:4:1 -no-undefined
 
--- lib/X11/modules/im/ximcp/Makefile.am.orig	2005-07-18 08:44:51.000000000 +0000
+++ lib/X11/modules/im/ximcp/Makefile.am	2005-07-18 08:45:18.000000000 +0000
@@ -10,7 +10,7 @@
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE -DXIM_t -DTRANS_CLIENT
 
 if XLIB_LOADABLE_I18N
 
--- lib/FS/src/Makefile.am.orig	2005-07-10 11:40:50.000000000 +0000
+++ lib/FS/src/Makefile.am	2005-07-10 12:04:52.000000000 +0000
@@ -29,7 +29,7 @@
 	FSSynchro.c	\
 	fs_transport.c
 
-AM_CFLAGS = $(DEP_CFLAGS) $(XTRANS_CFLAGS)
+AM_CFLAGS = $(DEP_CFLAGS) $(XTRANS_CFLAGS) -DFS_t -DTRANS_CLIENT
 libFS_la_LIBADD = $(DEP_LIBS) $(XTRANS_LIBS)
 
 INCLUDES = -I$(top_srcdir)/include/X11/fonts
--- lib/X11/src/Makefile.am.orig	2005-07-12 08:39:42.000000000 +0200
+++ lib/X11/src/Makefile.am	2005-07-12 08:39:57.000000000 +0200
@@ -17,7 +17,7 @@
 	$(BIGREQS_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
 	$(XDMCP_CFLAGS) \
-	-D_BSD_SOURCE
+	-D_BSD_SOURCE -DX11_t -DTRANS_CLIENT
 
 #
 # =============================== I18N =============================
--- lib/lbxutil/src/delta/lbxdelta.c.orig	2005-07-06 09:37:40.000000000 +0000
+++ lib/lbxutil/src/delta/lbxdelta.c	2005-07-06 09:37:53.000000000 +0000
@@ -24,6 +24,7 @@
  */
 /* $XFree86: xc/lib/lbxutil/delta/lbxdelta.c,v 1.7 2001/07/25 15:04:57 dawes Exp $ */
 
+#include <string.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #define _XLBX_SERVER_
--- app/lbxproxy/Makefile.am.orig	2005-07-18 09:09:04.000000000 +0000
+++ app/lbxproxy/Makefile.am	2005-07-18 09:09:45.000000000 +0000
@@ -22,7 +22,8 @@
 bin_PROGRAMS = lbxproxy
 
 lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include	\
-	-DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" -D_BSD_SOURCE
+	-DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" \
+	-D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER
 lbxproxy_LDADD = $(LBXPROXY_LIBS)
 
 lbxproxy_SOURCES = \
--- app/fonttosfnt/Makefile.am.orig	2005-07-18 09:27:46.000000000 +0000
+++ app/fonttosfnt/Makefile.am	2005-07-18 09:27:56.000000000 +0000
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = fonttosfnt
 
-fonttosfnt_CFLAGS = $(FONTTOSFNT_CFLAGS) -DXVENDORNAME=\"X.org\ Foundation\" -DXVENDORNAMESHORT=\"X.org\"
+fonttosfnt_CFLAGS = $(FONTTOSFNT_CFLAGS) -DXVENDORNAME=\"X.org\ Foundation\" -DXVENDORNAMESHORT=\"X.org\" -D_BSD_SOURCE
 fonttosfnt_LDADD = $(FONTTOSFNT_LIBS) -lm
 
 fonttosfnt_SOURCES =	\
--- app/xedit/lisp/write.c.orig	2005-07-18 09:32:53.000000000 +0000
+++ app/xedit/lisp/write.c	2005-07-18 09:33:31.000000000 +0000
@@ -29,6 +29,7 @@
 
 /* $XFree86: xc/programs/xedit/lisp/write.c,v 1.31tsi Exp $ */
 
+#include <stdio.h>
 #include "lisp/write.h"
 #include "lisp/hash.h"
 #include <math.h>
--- app/xedit/lisp/require.c.orig	2005-07-18 09:35:33.000000000 +0000
+++ app/xedit/lisp/require.c	2005-07-18 09:35:44.000000000 +0000
@@ -29,6 +29,7 @@
 
 /* $XFree86: xc/programs/xedit/lisp/require.c,v 1.17tsi Exp $ */
 
+#include <stdio.h>
 #include "lisp/require.h"
 
 /*
--- xserver/xorg/hw/xfree86/i2c/fi1236.c.orig	2005-07-18 09:37:45.000000000 +0000
+++ xserver/xorg/hw/xfree86/i2c/fi1236.c	2005-07-18 09:39:40.000000000 +0000
@@ -366,6 +366,7 @@
 		if(AFC==1)return TUNER_JUST_ABOVE;
 		return TUNER_OFF;
 	}
+	return TUNER_OFF;
 }
 
 static int MT2032_get_afc_hint(FI1236Ptr f)
--- app/mkfontscale/Makefile.am.orig	2005-07-18 09:43:34.000000000 +0000
+++ app/mkfontscale/Makefile.am	2005-07-18 09:43:47.000000000 +0000
@@ -21,7 +21,7 @@
 
 bin_PROGRAMS = mkfontscale
 
-mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@
+mkfontscale_CFLAGS = @MKFONTSCALE_CFLAGS@ -D_BSD_SOURCE
 mkfontscale_LDADD  = @MKFONTSCALE_LIBS@
 
 mkfontscale_SOURCES = \
--- app/xedit/lisp/core.c.orig	2005-07-18 09:46:09.000000000 +0000
+++ app/xedit/lisp/core.c	2005-07-18 09:47:27.000000000 +0000
@@ -29,6 +29,7 @@
 
 /* $XFree86: xc/programs/xedit/lisp/core.c,v 1.71tsi Exp $ */
 
+#include <stdio.h>
 #include "lisp/io.h"
 #include "lisp/core.h"
 #include "lisp/format.h"
--- lib/Xmu/src/Makefile.am.orig	2005-07-18 12:12:08.000000000 +0000
+++ lib/Xmu/src/Makefile.am	2005-07-18 12:12:29.000000000 +0000
@@ -3,7 +3,7 @@
 AM_CFLAGS = \
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/include/X11/Xmu \
-	$(XMU_CFLAGS)
+	$(XMU_CFLAGS) -D_BSD_SOURCE
 
 libXmu_la_LDFLAGS = -version-number 6:2:0
 libXmuu_la_LDFLAGS = -version-number 1:0:0
--- app/luit/sys.c.orig	2005-07-25 14:07:00.000000000 +0000
+++ app/luit/sys.c	2005-07-25 14:08:49.000000000 +0000
@@ -21,6 +21,7 @@
 */
 /* $XFree86: xc/programs/luit/sys.c,v 1.9 2003/08/17 20:39:58 dawes Exp $ */
 
+#define _XOPEN_SOURCE
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
--- app/xfs/Makefile.am.orig	2005-07-30 06:59:27.000000000 +0000
+++ app/xfs/Makefile.am	2005-07-30 07:24:39.000000000 +0000
@@ -26,7 +26,7 @@
 FONT_FLAGS = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO
 
 AM_CFLAGS = $(XFS_CFLAGS) -I$(top_srcdir)/include -DXFSPIDDIR=\"/var/run\" -D_BSD_SOURCE \
-		-DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS)
+		-DDEFAULT_CONFIG_FILE=\"$(configdir)/config\" $(FONT_FLAGS) -DFONT_t -DTRANS_SERVER -DTRANS_REOPEN
 LDADD = $(XFS_LIBS)
 
 xfs_SOURCES = \
