Fix compiler warnings

Xcode 9.0 added new compiler warnings which were triggered
by the old code. Fix them.

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

OSXvnc-server/CGS.h

@@ -29,7 +29,7 @@ extern CGError CGSGetGlobalCursorData(CGSConnectionRef connection,
 
 extern CGError CGSGetCurrentCursorLocation(CGSConnectionRef connection, CGPoint* point);
 extern int CGSCurrentCursorSeed(void);
-extern int CGSHardwareCursorActive(); // flaky? doesn't seem to work after DM is initialized
+extern int CGSHardwareCursorActive(void); // flaky? doesn't seem to work after DM is initialized
 
 #ifndef SAVECOLORS
 #define SAVECOLORS\
@@ -47,4 +47,4 @@ extern int CGSHardwareCursorActive(); // flaky? doesn't seem to work after DM is
 	SetPenState(&oldState);\
 	RGBForeColor(&oldForeColor);\
 	RGBBackColor(&oldBackColor);
-#endif
+#endif

OSXvnc-server/d3des.c

@@ -123,36 +123,33 @@ register unsigned long *raw1;
 	return;
 	}
 
-void cpkey(into)
-register unsigned long *into;
+void cpkey(unsigned long *into)
 {
-	register unsigned long *from, *endp;
-
-	from = KnL, endp = &KnL[32];
-	while( from < endp ) *into++ = *from++;
-	return;
-	}
-
-void usekey(from)
-register unsigned long *from;
+    unsigned long *from = KnL;
+    unsigned long *endp = &KnL[32];
+    while (from < endp) {
+        *into++ = *from++;
+    }
+}
+
+void usekey(unsigned long *from)
 {
-	register unsigned long *to, *endp;
+    unsigned long *to = KnL;
+    unsigned long *endp = &KnL[32];
 
-	to = KnL, endp = &KnL[32];
-	while( to < endp ) *to++ = *from++;
-	return;
-	}
+    while (to < endp) {
+        *to++ = *from++;
+    }
+}
 
-void des(inblock, outblock)
-unsigned char *inblock, *outblock;
+void des(unsigned char *inblock, unsigned char *outblock)
 {
 	unsigned long work[2];
 
 	scrunch(inblock, work);
 	desfunc(work, KnL);
 	unscrun(work, outblock);
-	return;
-	}
+}
 
 static void scrunch(outof, into)
 register unsigned char *outof;

OSXvnc-server/getMACAddress.h

@@ -9,4 +9,4 @@
 
 #import <Foundation/NSString.h>
 
-extern NSString *getMACAddressString();
+extern NSString *getMACAddressString(void);

OSXvnc-server/miregion.c

@@ -360,18 +360,13 @@ miRegionDestroy(pReg)
     xfree(pReg);
 }
 
-void
-miRegionUninit(pReg)
-    RegionPtr pReg;
+void miRegionUninit(RegionPtr pReg)
 {
     good(pReg);
     xfreeData(pReg);
 }
 
-Bool
-miRectAlloc(pRgn, n)
-    register RegionPtr pRgn;
-    int n;
+Bool miRectAlloc(RegionPtr pRgn, int n)
 {
     Must_have_memory = TRUE; /* XXX */
     if (!pRgn->data)
@@ -614,18 +609,20 @@ miAppendNonO (pReg, r, rEnd, y1, y2)
  *
  *-----------------------------------------------------------------------
  */
-static Bool
-miRegionOp(newReg, reg1, reg2, overlapFunc, appendNon1, appendNon2, pOverlap)
-    RegionPtr       newReg;                 /* Place to store result         */
-    RegionPtr       reg1;                   /* First region in operation     */
-    RegionPtr       reg2;                   /* 2d region in operation        */
-    Bool            (*overlapFunc)();       /* Function to call for over-
-                                             * lapping bands                 */
-    Bool            appendNon1;             /* Append non-overlapping bands  */
-                                            /* in region 1 ? */
-    Bool            appendNon2;             /* Append non-overlapping bands  */
-                                            /* in region 2 ? */
-    Bool            *pOverlap;
+static Bool miRegionOp(RegionPtr newReg,           /* Place to store result         */
+                       RegionPtr reg1,             /* First region in operation     */
+                       RegionPtr reg2,             /* 2d region in operation        */
+                       Bool (*overlapFunc)(RegionPtr pReg, BoxPtr r1, BoxPtr r1End,
+                                           BoxPtr r2, BoxPtr r2End,
+                                           short y1, short y2,
+                                           Bool *pOverlap),
+                                                   /* Function to call for over-
+                                                    * lapping bands                 */
+                       Bool appendNon1,            /* Append non-overlapping bands  */
+                                                   /* in region 1 ? */
+                       Bool appendNon2,            /* Append non-overlapping bands  */
+                                                   /* in region 2 ? */
+                       Bool *pOverlap)
 {
     register BoxPtr r1;                     /* Pointer into first region     */
     register BoxPtr r2;                     /* Pointer into 2d region        */
@@ -842,9 +839,7 @@ miRegionOp(newReg, reg1, reg2, overlapFunc, appendNon1, appendNon2, pOverlap)
  *
  *-----------------------------------------------------------------------
  */
-void
-miSetExtents (pReg)
-    register RegionPtr pReg;
+void miSetExtents(RegionPtr pReg)
 {
     register BoxPtr pBox, pBoxEnd;
 
@@ -901,16 +896,7 @@ miSetExtents (pReg)
  *-----------------------------------------------------------------------
  */
 /*ARGSUSED*/
-static Bool
-miIntersectO (pReg, r1, r1End, r2, r2End, y1, y2, pOverlap)
-    register RegionPtr  pReg;
-    register BoxPtr     r1;
-    BoxPtr              r1End;
-    register BoxPtr     r2;
-    BoxPtr              r2End;
-    short               y1;
-    short               y2;
-    Bool                *pOverlap;
+static Bool miIntersectO(RegionPtr pReg, BoxPtr r1, BoxPtr r1End, BoxPtr r2, BoxPtr r2End, short y1, short y2, Bool *pOverlap)
 {
     register int        x1;
     register int        x2;
@@ -1039,15 +1025,8 @@ miIntersect(newReg, reg1, reg2)
  *-----------------------------------------------------------------------
  */
 static Bool
-miUnionO (pReg, r1, r1End, r2, r2End, y1, y2, pOverlap)
-    register RegionPtr  pReg;
-    register BoxPtr     r1;
-             BoxPtr     r1End;
-    register BoxPtr     r2;
-             BoxPtr     r2End;
-             short      y1;
-             short      y2;
-             Bool       *pOverlap;
+miUnionO(RegionPtr pReg, BoxPtr r1, BoxPtr r1End,
+         BoxPtr r2, BoxPtr r2End, short y1, short y2, Bool *pOverlap)
 {
     register BoxPtr     pNextRect;
     register int        x1;     /* left and right side of current union */
@@ -1653,15 +1632,8 @@ miRectsToRegion(nrects, prect, ctype)
  */
 /*ARGSUSED*/
 static Bool
-miSubtractO (pReg, r1, r1End, r2, r2End, y1, y2, pOverlap)
-    register RegionPtr  pReg;
-    register BoxPtr     r1;
-    BoxPtr              r1End;
-    register BoxPtr     r2;
-    BoxPtr              r2End;
-    register int        y1;
-             int        y2;
-    Bool                *pOverlap;
+miSubtractO (RegionPtr pReg, BoxPtr r1, BoxPtr r1End,
+             BoxPtr r2, BoxPtr r2End, short y1, short y2, Bool *pOverlap)
 {
     register BoxPtr     pNextRect;
     register int        x1;
@@ -2271,15 +2243,9 @@ static void QuickSortSpans(spans, widths, numSpans)
     returns the number of new, clipped scanlines.
 */
 
-int
-miClipSpans(prgnDst, ppt, pwidth, nspans, pptNew, pwidthNew, fSorted)
-    RegionPtr               prgnDst;
-    register DDXPointPtr    ppt;
-    register int            *pwidth;
-    int                     nspans;
-    register DDXPointPtr    pptNew;
-    int                     *pwidthNew;
-    int                     fSorted;
+int miClipSpans(RegionPtr prgnDst, DDXPointPtr ppt,
+                int *pwidth, int nspans,
+                DDXPointPtr pptNew, int *pwidthNew, int fSorted)
 {
     register DDXPointPtr pptLast;
     int                 *pwidthNewStart;        /* the vengeance of Xerox! */
@@ -2388,9 +2354,7 @@ miClipSpans(prgnDst, ppt, pwidth, nspans, pptNew, pwidthNew, fSorted)
 }
 
 /* find the band in a region with the most rectangles */
-int
-miFindMaxBand(prgn)
-    RegionPtr prgn;
+int miFindMaxBand(RegionPtr prgn)
 {
     register int nbox;
     register BoxPtr pbox;

OSXvnc-server/rfb.h

@@ -372,7 +372,7 @@ extern unsigned rfbProtocolMinorVersion;
 
 extern unsigned rfbPort;
 
-extern char *rfbGetFramebuffer();
+extern char *rfbGetFramebuffer(void);
 extern void rfbGetFramebufferUpdateInRect(int x, int y, int w, int h);
 
 extern void rfbStartClientWithFD(int client_fd);
@@ -399,7 +399,7 @@ extern void rfbLog(char *format, ...);
 extern void rfbDebugLog(char *format, ...);
 extern void rfbLogPerror(char *str);
 
-extern void rfbShutdown();
+extern void rfbShutdown(void);
 
 /* sockets.c */
 
@@ -411,12 +411,12 @@ extern int WriteExact(rfbClientPtr cl, const void *buf, size_t len);
 
 /* cutpaste.c */
 
-extern void initPasteboard();
+extern void initPasteboard(void);
 extern void initPasteboardForClient(rfbClientPtr cl);
 extern void freePasteboardForClient(rfbClientPtr cl);
 
 extern void rfbSetCutText(rfbClientPtr cl, char *str, int len);
-extern void rfbCheckForPasteboardChange();
+extern void rfbCheckForPasteboardChange(void);
 extern void rfbClientUpdatePasteboard(rfbClientPtr cl);
 
 extern void rfbReceiveRichClipboardAvailable(rfbClientPtr cl);
@@ -453,7 +453,7 @@ extern void rfbClientListInit(void);
 extern rfbClientIteratorPtr rfbGetClientIterator(void);
 extern rfbClientPtr rfbClientIteratorNext(rfbClientIteratorPtr iterator);
 extern void rfbReleaseClientIterator(rfbClientIteratorPtr iterator);
-extern Bool rfbClientsConnected();
+extern Bool rfbClientsConnected(void);
 
 extern void rfbNewClientConnection(int sock);
 extern rfbClientPtr rfbNewClient(int sock);
@@ -508,8 +508,8 @@ extern void PrintPixelFormat(rfbPixelFormat *pf);
 extern int httpPort;
 extern char *httpDir;
 
-extern void httpInitSockets();
-extern void httpCheckFds();
+extern void httpInitSockets(void);
+extern void httpCheckFds(void);
 
 
 
@@ -520,7 +520,7 @@ extern char *rfbAuthPasswdFile;
 extern Bool rfbAuthenticating;
 extern int rfbMaxLoginAttempts;
 
-extern void rfbAuthInit();
+extern void rfbAuthInit(void);
 extern void rfbAuthNewClient(rfbClientPtr cl);
 extern void rfbProcessAuthVersion(rfbClientPtr cl);
 extern void rfbAuthProcessClientMessage(rfbClientPtr cl);
@@ -609,8 +609,8 @@ extern int rfbDimmingShutdown(void);
 
 /* mousecursor.c */
 
-extern void GetCursorInfo();
-extern void rfbCheckForCursorChange();
+extern void GetCursorInfo(void);
+extern void rfbCheckForCursorChange(void);
 extern Bool rfbShouldSendNewCursor(rfbClientPtr cl);
 extern Bool rfbShouldSendNewPosition(rfbClientPtr cl);
 
@@ -619,7 +619,7 @@ extern Bool rfbSendCursorPos(rfbClientPtr cl);
 
 /* screencapture.c */
 
-screen_data_t *screen_InitCapture ();
+screen_data_t *screen_InitCapture(void);
 extern char *screen_Capture (screen_data_t *p_data);
 extern void screen_CloseCapture (screen_data_t *p_data);
 

OSXvnc-server/tight.c

@@ -1498,7 +1498,7 @@ DetectSmoothImage24 (cl, fmt, w, h)
     int w, h;
 {
     int off;
-    int x, y, d, dx, c;
+    int d, dx, c;
     int diffStat[256];
     int pixelCount = 0;
     int pix, left[3];
@@ -1510,7 +1510,8 @@ DetectSmoothImage24 (cl, fmt, w, h)
 
     memset(diffStat, 0, 256*sizeof(int));
 
-    y = 0, x = 0;
+    int x = 0;
+    int y = 0;
     while (y < h && x < w) {
         for (d = 0; d < h - y && d < w - x - DETECT_SUBROW_WIDTH; d++) {
             for (c = 0; c < 3; c++) {

OSXvnc-server/translate.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include "rfb.h"
 
-static Bool rfbSetClientColourMapBGR233();
+static Bool rfbSetClientColourMapBGR233(rfbClientPtr cl);
 
 Bool rfbEconomicTranslate = FALSE;
 
@@ -268,9 +268,7 @@ Bool rfbSetTranslateFunctionUsingFormat(rfbClientPtr cl, rfbPixelFormat inFormat
  * just like an 8-bit BGR233 true colour client.
  */
 
-static Bool
-rfbSetClientColourMapBGR233(cl)
-    rfbClientPtr cl;
+static Bool rfbSetClientColourMapBGR233(rfbClientPtr cl)
 {
     char buf[sz_rfbSetColourMapEntriesMsg + 256 * 3 * 2];
     rfbSetColourMapEntriesMsg *scme = (rfbSetColourMapEntriesMsg *)buf;

OSXvnc-server/zlib.c

@@ -38,10 +38,7 @@
  *                              rectangle encoding.
  */
 
-Bool
-rfbSendOneRectEncodingZlib(cl, x, y, w, h)
-    rfbClientPtr cl;
-    int x, y, w, h;
+Bool rfbSendOneRectEncodingZlib(rfbClientPtr cl, int x, int y, int w, int h)
 {
     rfbFramebufferUpdateRectHeader rect;
     rfbZlibHeader hdr;