Attachment 20304 Details for Bug 15078 – whitespace cleaned version of id=15207

[patch] whitespace cleaned version of id=15207

0002-Compile-warning-fixes.patch (text/plain), 3.75 KB, created by Peter Breitenlohner on 2008-11-14 05:22:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Breitenlohner

Created: 2008-11-14 05:22:27 UTC

Size: 3.75 KB

patch

obsolete

>From ab10f4b84e90903874e32c597b92d6868ac502a1 Mon Sep 17 00:00:00 2001
>From: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
>Date: Sun, 16 Mar 2008 19:02:31 -0300
>Subject: [PATCH] Compile warning fixes.
>
>Use constant octals instead of constant characters in switch case values
>to avoid warnings/problems if constant characters are signed.
>  Ansify some functions in utils.c.
>
>Signed-off-by: Peter Breitenlohner <peb@mppmu.mpg.de>
>---
> psgeom.c |    8 ++++----
> utils.c  |   39 +++++++++++----------------------------
> 2 files changed, 15 insertions(+), 32 deletions(-)
>
>diff --git a/psgeom.c b/psgeom.c
>index cfb3ab5..5266614 100644
>--- a/psgeom.c
>+++ b/psgeom.c
>@@ -1389,10 +1389,10 @@ int	eG,nG,gI,l,g;
> 		switch (buf[0]) {
> 		    case '.': case ':': case ',': case ';':
> 		    case '\'': case '"': case '`': case '~':
>- 		    case '^': case '\250': case '\270': case '\267':
>- 		    case '\260': case '\252': case '\272': case '\271':
>- 		    case '\262': case '\263': case '\264': case '\255':
>- 		    case '\254': case '\257':
>+		    case '^': case 0250: case 0270: case 0267:
>+		    case 0260: case 0252: case 0272: case 0271:
>+		    case 0262: case 0263: case 0264: case 0255:
>+		    case 0254: case 0257:
> 			top->size[(g*2)+l]= SZ_LARGE;
> 			break;
> 		}
>diff --git a/utils.c b/utils.c
>index c79753d..e6c6bab 100644
>--- a/utils.c
>+++ b/utils.c
>@@ -34,8 +34,7 @@
> /***====================================================================***/
> 
> Opaque
>-uAlloc(size)
>-    unsigned	size;
>+uAlloc(unsigned size)
> {
>     return((Opaque)malloc(size));
> }
>@@ -43,9 +42,7 @@ uAlloc(size)
> /***====================================================================***/
> 
> Opaque
>-uCalloc(n,size)
>-    unsigned	n;
>-    unsigned	size;
>+uCalloc(unsigned n, unsigned size)
> {
>     return((Opaque)calloc(n,size));
> }
>@@ -53,9 +50,7 @@ uCalloc(n,size)
> /***====================================================================***/
> 
> Opaque
>-uRealloc(old,newSize)
>-    Opaque	old;
>-    unsigned	newSize;
>+uRealloc(Opaque old, unsigned newSize)
> {
>     if (old==NULL)
> 	 return((Opaque)malloc(newSize));
>@@ -65,11 +60,7 @@ uRealloc(old,newSize)
> /***====================================================================***/
> 
> Opaque
>-uRecalloc(old,nOld,nNew,itemSize)
>-    Opaque	old;
>-    unsigned	nOld;
>-    unsigned	nNew;
>-    unsigned	itemSize;
>+uRecalloc(Opaque old, unsigned nOld, unsigned nNew, unsigned itemSize)
> {
> char *rtrn;
> 
>@@ -87,8 +78,7 @@ char *rtrn;
> /***====================================================================***/
> 
> void
>-uFree(ptr)
>-    Opaque ptr;
>+uFree(Opaque ptr)
> {
>     if (ptr!=(Opaque)NULL)
> 	free((char *)ptr);
>@@ -103,8 +93,7 @@ static	FILE	*entryFile=	NULL;
> 	int	 uEntryLevel;
> 
> Boolean
>-uSetEntryFile(name)
>-    char *name;
>+uSetEntryFile(char *name)
> {
>     if ((entryFile!=NULL)&&(entryFile!=stderr)) {
> 	fprintf(entryFile,"switching to %s\n",name?name:"stderr");
>@@ -136,9 +125,7 @@ va_list ap;
> }
> 
> void
>-uExit(l,rtVal)
>-    int		l;
>-    char *	rtVal;
>+uExit(int l, char *rtVal)
> {
> int	i;
> 
>@@ -160,8 +147,7 @@ int	i;
> 	int	 uDebugIndentSize=	4;
> 
> Boolean
>-uSetDebugFile(name)
>-    char *name;
>+uSetDebugFile(char *name)
> {
>     if ((uDebugFile!=NULL)&&(uDebugFile!=stderr)) {
> 	fprintf(uDebugFile,"switching to %s\n",name?name:"stderr");
>@@ -317,8 +303,7 @@ uInternalError(char *s,...)
> 
> #ifndef HAVE_STRDUP
> char *
>-uStringDup(str)
>-    char *str;
>+uStringDup(char *str)
> {
> char *rtrn;
> 
>@@ -332,8 +317,7 @@ char *rtrn;
> 
> #ifndef HAVE_STRCASECMP
> int
>-uStrCaseCmp(str1, str2)
>-    char *str1, *str2;
>+uStrCaseCmp(char *str1, char *str2)
> {
>     char buf1[512],buf2[512];
>     char c, *s;
>@@ -359,8 +343,7 @@ uStrCaseCmp(str1, str2)
> }
> 
> int
>-uStrCasePrefix(prefix, str)
>-    char *prefix, *str;
>+uStrCasePrefix(char *prefix, char *str)
> {
>     char c1;
>     char c2;
>-- 
>1.6.0.3
>

Actions: View | Splinter Review

Attachments on bug 15078: 15207 | 20304 | 20305

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.