From a5e2f38bde0eb876d27d00a4c9e5461c3812923d Mon Sep 17 00:00:00 2001
From: Ali Gholami Rudi <ali@rudi.ir>
Date: Thu, 24 Sep 2009 17:15:05 +0330
Subject: [PATCH] close fbvnc

---
 Makefile             | 30 ++++++++----------------------
 vt52vnc.c => fbvnc.c |  2 +-
 vt52vnc.h => fbvnc.h |  0
 vncproto.c           | 14 +++++++++-----
 4 files changed, 18 insertions(+), 28 deletions(-)
 rename vt52vnc.c => fbvnc.c (98%)
 rename vt52vnc.h => fbvnc.h (100%)

diff --git a/Makefile b/Makefile
index ba8c834..0491a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,11 @@
-# Makefile for vt52vnc, (c) 1999 Milan Pikula
-
-CC = gcc
-CCOPTS = -Wall -O2 -ggdb
-AS = as
-ASOPTS =
-LD = ld
-LDOPTS =
-OBJS= vncproto.o vt52vnc.o draw.o
-
-all:	$(OBJS)
-	$(CC) $(CCOPTS) -o vt52vnc $(OBJS)
+CC = cc
+CFLAGS = -std=gnu89 -pedantic -Wall -O2
+LDFLAGS =
 
+all: fbvnc
 .c.o:
-	$(CC) $(CCOPTS) -c -o $*.o $<
-
-.S.o:
-	$(AS) $(ASOPTS) -o $*.o $<
-
+	$(CC) -c $(CFLAGS) $<
+fbvnc: vncproto.o fbvnc.o draw.o
+	$(CC) $(LDFLAGS) -o $@ $^
 clean:
-	rm -f core *.o *~ *.bak *.tmp
-
-miniclean:
-	rm -f *.o
-
+	rm -f *.o fbvnc
diff --git a/vt52vnc.c b/fbvnc.c
similarity index 98%
rename from vt52vnc.c
rename to fbvnc.c
index a9ada89..a865e22 100644
--- a/vt52vnc.c
+++ b/fbvnc.c
@@ -9,7 +9,7 @@
 
 #define byterate 1920
 
-#include "vt52vnc.h"
+#include "fbvnc.h"
 #include "draw.h"
 
 int main(int argc, char * argv[])
diff --git a/vt52vnc.h b/fbvnc.h
similarity index 100%
rename from vt52vnc.h
rename to fbvnc.h
diff --git a/vncproto.c b/vncproto.c
index a27d310..0779c9e 100644
--- a/vncproto.c
+++ b/vncproto.c
@@ -11,7 +11,7 @@
 #include <pwd.h>
 #include <string.h>
 
-#include "vt52vnc.h"
+#include "fbvnc.h"
 #include "draw.h"
 
 #define MAXRESOL		(1 << 21)
@@ -137,7 +137,8 @@ int vncproto_init(char * addr, int port)
 
 	encodingsmsgp->type = rfbSetEncodings;
 	encodingsmsgp->nEncodings = htons(1);
-	*((CARD32 *)((void *)(encodingsmsgp) + sizeof(rfbSetEncodingsMsg))) = htonl(rfbEncodingRaw);
+	*((CARD32 *)((char *) encodingsmsgp +
+		sizeof(rfbSetEncodingsMsg))) = htonl(rfbEncodingRaw);
 	write(servsock, encodingsmsgp, sizeof(*encodingsmsgp)+sizeof(CARD32));
 	return servsock;
 }
@@ -183,13 +184,16 @@ int parse_vnc_in(int fd)
 		return -1;
 	switch (vomsgp->type) {
 		case rfbFramebufferUpdate:
-			i = read(fd, ((void *)vomsgp)+sizeof(CARD8), sizeof(rfbFramebufferUpdateMsg) - sizeof(CARD8));
+			i = read(fd, (char *) vomsgp + sizeof(CARD8),
+				sizeof(rfbFramebufferUpdateMsg) - sizeof(CARD8));
 			break;
 		case rfbBell:
-			i = read(fd, ((void *)vomsgp)+sizeof(CARD8), sizeof(rfbBellMsg) - sizeof(CARD8));
+			i = read(fd, (char *) vomsgp + sizeof(CARD8),
+				sizeof(rfbBellMsg) - sizeof(CARD8));
 			break;
 		case rfbServerCutText:
-			i = read(fd, ((void *)vomsgp)+sizeof(CARD8), sizeof(rfbServerCutTextMsg) - sizeof(CARD8));
+			i = read(fd, (char *) vomsgp + sizeof(CARD8),
+				sizeof(rfbServerCutTextMsg) - sizeof(CARD8));
 			break;
 		default:
 			return -1;
-- 
2.11.4.GIT