Attachment 15203 Details for Bug 15073 – 0001-Compile-warning-fixes.patch

[patch] 0001-Compile-warning-fixes.patch

0001-Compile-warning-fixes.patch (text/plain), 6.74 KB, created by Paulo César Pereira de Andrade on 2008-03-16 14:29:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paulo César Pereira de Andrade

Created: 2008-03-16 14:29:50 UTC

Size: 6.74 KB

patch

obsolete

>From 156ecb44530daafc1d030986706c4dc0f925e05b Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sun, 16 Mar 2008 18:27:14 -0300
>Subject: [PATCH] Compile warning fixes.
>
>  Ansify functions in dsimple.c.
>  Protect unused variables around the related ifdef.
>---
> dsimple.c  |   89 +++++++++++++++++++++++++----------------------------------
> xlsfonts.c |    2 +
> 2 files changed, 40 insertions(+), 51 deletions(-)
>
>diff --git a/dsimple.c b/dsimple.c
>index c84ac3b..d74c72d 100644
>--- a/dsimple.c
>+++ b/dsimple.c
>@@ -71,8 +71,8 @@ static void _bitmap_error(int, char *);
> /*
>  * Malloc: like malloc but handles out of memory using Fatal_Error.
>  */
>-char *Malloc(size)
>-     unsigned size;
>+char *
>+Malloc(unsigned size)
> {
> 	char *data;
> 
>@@ -86,9 +86,8 @@ char *Malloc(size)
> /*
>  * Realloc: like Malloc except for realloc, handles NULL using Malloc.
>  */
>-char *Realloc(ptr, size)
>-        char *ptr;
>-        int size;
>+char *
>+Realloc(char *ptr, int size)
> {
> 	char *new_ptr;
> 
>@@ -106,9 +105,8 @@ char *Realloc(ptr, size)
>  * Get_Display_Name (argc, argv) Look for -display, -d, or host:dpy (obselete)
>  * If found, remove it from command line.  Don't go past a lone -.
>  */
>-char *Get_Display_Name(pargc, argv)
>-    int *pargc;  /* MODIFIED */
>-    char **argv; /* MODIFIED */
>+char *
>+Get_Display_Name(int *pargc/* MODIFIED */, char **argv/* MODIFIED */)
> {
>     int argc = *pargc;
>     char **pargv = argv+1;
>@@ -143,9 +141,8 @@ char *Get_Display_Name(pargc, argv)
>  * Get_Printer_Name (argc, argv) Look for -printer, -p,
>  * If found, remove it from command line.  Don't go past a lone -.
>  */
>-char *Get_Printer_Name(pargc, argv)
>-    int *pargc;  /* MODIFIED */
>-    char **argv; /* MODIFIED */
>+char *
>+Get_Printer_Name(int *pargc/* MODIFIED */, char **argv/* MODIFIED */)
> {
>     int argc = *pargc;
>     char **pargv = argv+1;
>@@ -179,8 +176,8 @@ char *Get_Printer_Name(pargc, argv)
>  * Open_Display: Routine to open a display with correct error handling.
>  *               Does not require dpy or screen defined on entry.
>  */
>-Display *Open_Display(display_name)
>-char *display_name;
>+Display *
>+Open_Display(char *display_name)
> {
> 	Display *d;
> 
>@@ -203,12 +200,13 @@ char *display_name;
>  *                           for this display is then stored in screen.
>  *                           Does not require dpy or screen defined.
>  */
>-void Setup_Display_And_Screen(argc, argv)
>-int *argc;      /* MODIFIED */
>-char **argv;    /* MODIFIED */
>+void
>+Setup_Display_And_Screen(int *argc/* MODIFIED */, char **argv/* MODIFIED */)
> {
>-        char *displayname = NULL,
>-             *printername = NULL;
>+        char *displayname = NULL;
>+#ifdef BUILD_PRINTSUPPORT
>+        char *printername = NULL;
>+#endif
>         
>         displayname = Get_Display_Name(argc, argv);
> #ifdef BUILD_PRINTSUPPORT
>@@ -267,8 +265,8 @@ void Close_Display(void)
> /*
>  * Open_Font: This routine opens a font with error handling.
>  */
>-XFontStruct *Open_Font(name)
>-char *name;
>+XFontStruct *
>+Open_Font(char *name)
> {
> 	XFontStruct *font;
> 
>@@ -282,7 +280,7 @@ char *name;
> /*
>  * Beep: Routine to beep the display.
>  */
>-void Beep()
>+void Beep(void)
> {
> 	XBell(dpy, 50);
> }
>@@ -292,9 +290,8 @@ void Beep()
>  * ReadBitmapFile: same as XReadBitmapFile except it returns the bitmap
>  *                 directly and handles errors using Fatal_Error.
>  */
>-static void _bitmap_error(status, filename)
>-     int status;
>-     char *filename;
>+static void
>+_bitmap_error(int status, char *filename)
> {
>   if (status == BitmapOpenFailed)
>     Fatal_Error("Can't open file %s!", filename);
>@@ -304,10 +301,9 @@ static void _bitmap_error(status, filename)
>     Fatal_Error("Out of memory!");
> }
> 
>-Pixmap ReadBitmapFile(d, filename, width, height, x_hot, y_hot)
>-     Drawable d;
>-     char *filename;
>-     int *width, *height, *x_hot, *y_hot;
>+Pixmap
>+ReadBitmapFile(Drawable d, char *filename,
>+	       int *width, int *height, int *x_hot, int *y_hot)
> {
>   Pixmap bitmap;
>   int status;
>@@ -326,10 +322,9 @@ Pixmap ReadBitmapFile(d, filename, width, height, x_hot, y_hot)
>  * WriteBitmapFile: same as XWriteBitmapFile except it handles errors
>  *                  using Fatal_Error.
>  */
>-void WriteBitmapFile(filename, bitmap, width, height, x_hot, y_hot)
>-     char *filename;
>-     Pixmap bitmap;
>-     int width, height, x_hot, y_hot;
>+void
>+WriteBitmapFile(char *filename, Pixmap bitmap,
>+		int width, int height, int x_hot, int y_hot)
> {
>   int status;
> 
>@@ -362,9 +357,7 @@ void WriteBitmapFile(filename, bitmap, width, height, x_hot, y_hot)
>  *                     all command line arguments, and other setup is done.
>  *                     For examples of usage, see xwininfo, xwd, or xprop.
>  */
>-Window Select_Window_Args(rargc, argv)
>-     int *rargc;
>-     char **argv;
>+Window Select_Window_Args(int *rargc, char **argv)
> #define ARGC (*rargc)
> {
> 	int nargc=1;
>@@ -429,9 +422,8 @@ Window Select_Window_Args(rargc, argv)
>  *                on the display.  This routine does not require wind to
>  *                be defined.
>  */
>-unsigned long Resolve_Color(w, name)
>-     Window w;
>-     char *name;
>+unsigned long
>+Resolve_Color(Window w, char *name)
> {
> 	XColor c;
> 	Colormap colormap;
>@@ -465,12 +457,9 @@ unsigned long Resolve_Color(w, name)
>  *                   Width and height are required solely for efficiency.
>  *                   If needed, they can be obtained via. XGetGeometry.
>  */
>-Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitmap, width, height)
>-     Display *dpy;
>-     Drawable d;
>-     GC gc;
>-     Pixmap bitmap;
>-     int width, height;
>+Pixmap
>+Bitmap_To_Pixmap(Display *dpy, Drawable d, GC gc,
>+		 Pixmap bitmap, int width, int height)
> {
>   Pixmap pix;
>   int x;
>@@ -491,7 +480,7 @@ Pixmap Bitmap_To_Pixmap(dpy, d, gc, bitmap, width, height)
> /*
>  * blip: a debugging routine.  Prints Blip! on stderr with flushing. 
>  */
>-void blip()
>+void blip(void)
> {
>     fflush(stdout);
>     fprintf(stderr, "blip!\n");
>@@ -503,8 +492,8 @@ void blip()
>  * Routine to let user select a window using the mouse
>  */
> 
>-Window Select_Window(dpy)
>-     Display *dpy;
>+Window
>+Select_Window(Display *dpy)
> {
>   int status;
>   Cursor cursor;
>@@ -554,10 +543,8 @@ Window Select_Window(dpy)
>  *                   one found will be returned.  Only top and its subwindows
>  *                   are looked at.  Normally, top should be the RootWindow.
>  */
>-Window Window_With_Name(dpy, top, name)
>-     Display *dpy;
>-     Window top;
>-     char *name;
>+Window
>+Window_With_Name(Display *dpy, Window top, char *name)
> {
> 	Window *children, dummy;
> 	unsigned int nchildren;
>diff --git a/xlsfonts.c b/xlsfonts.c
>index 4e2be2b..702d6e9 100644
>--- a/xlsfonts.c
>+++ b/xlsfonts.c
>@@ -118,7 +118,9 @@ void usage(void)
> int main(int argc, char **argv)
> {
>     int argcnt = 0, i;
>+#ifdef BUILD_PRINTSUPPORT
>     char *mode;
>+#endif
> 
>     INIT_NAME;
> 
>-- 
>1.5.3.2
>

Actions: View | Splinter Review

Attachments on bug 15073: 15203

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.