[PATCH 2/3] xvfb: void'lization of procedures

Tiago Vignatti tiago.vignatti at nokia.com
Thu Apr 8 07:34:13 PDT 2010


Just code organization. The semantics are the same.

(this changes will make sense in the next commit)

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
---
 hw/vfb/InitOutput.c |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 75ba9a4..4e82aee 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -274,7 +274,7 @@ ddxUseMsg(void)
 #endif
 }
 
-static int
+static void
 vfbProcessScreen(void)
 {
 	if (vfbScreenNum < 0 || vfbScreenNum >= MAXSCREENS)
@@ -291,7 +291,6 @@ vfbProcessScreen(void)
 	if (vfbScreenNum >= vfbNumScreens)
 	    vfbNumScreens = vfbScreenNum + 1;
 	lastScreen = vfbScreenNum;
-	return 3;
 }
 
 static int
@@ -307,14 +306,14 @@ vfbGetScreen(char *argv[], int i)
            argv[i+2], vfbScreenNum);
     }
 
-	return vfbProcessScreen();
+	vfbProcessScreen();
+	return 3;
 }
 
-static int
+static void
 vfbProcessPixdepths(void)
 {
     vfbPixmapDepths[vfbPixdepth] = TRUE;
-    return 2;
 }
 
 static int
@@ -329,12 +328,13 @@ vfbGetPixdepths(int argc, char *argv[], int i)
 		FatalError("Invalid pixmap depth %d passed to -pixdepths\n",
 			   vfbPixdepth);
 	    }
-		return vfbProcessPixdepths();
+		vfbProcessPixdepths();
+		return 2;
 	}
 	return 1;
 }
 
-static int
+static void
 vfbProcessBlackpixel(void)
 {
 	if (-1 == lastScreen)
@@ -349,17 +349,17 @@ vfbProcessBlackpixel(void)
 	{
 	    vfbScreens[lastScreen].blackPixel = vfbBlackpix;
 	}
-	return 2;
 }
 
 static int
 vfbGetBlackpixel(char *argv[], int i)
 {
 	vfbBlackpix = atoi(argv[++i]);
-	return vfbProcessBlackpixel();
+	vfbProcessBlackpixel();
+    return 2;
 }
 
-static int
+static void
 vfbProcessWhitepixel(void)
 {
 	if (-1 == lastScreen)
@@ -374,17 +374,17 @@ vfbProcessWhitepixel(void)
 	{
 	    vfbScreens[lastScreen].whitePixel = vfbWhitePix;
 	}
-	return 2;
 }
 
 static int
 vfbGetWhitepixel(char *argv[], int i)
 {
 	vfbWhitePix = atoi(argv[++i]);
-	return vfbProcessWhitepixel();
+	vfbProcessWhitepixel();
+	return 2;
 }
 
-static int
+static void
 vfbProcessLinebias(void)
 {
 	if (-1 == lastScreen)
@@ -399,14 +399,14 @@ vfbProcessLinebias(void)
 	{
 	    vfbScreens[lastScreen].lineBias = vfbLinebias;
 	}
-	return 2;
 }
 
 static int
 vfbGetLinebias(char *argv[], int i)
 {
 	vfbLinebias = atoi(argv[++i]);
-	return vfbProcessLinebias();
+	vfbProcessLinebias();
+	return 2;
 }
 
 int
-- 
1.6.0.4



More information about the xorg-devel mailing list