Ark/krfb
1
0
Fork 0
mirror of https://github.com/KDE/krfb synced 2026-07-01 07:41:17 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove most compiler warnings

Browse Source 
svn path=/trunk/kdenetwork/krfb/; revision=148029
This commit is contained in:
Tim Jansen
2002-04-08 23:43:08 +00:00
parent 49db972dcb
commit 694553ccff
18 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
krfb/rfbcontroller.cc
View File

@@ -74,7 +74,7 @@ static enum rfbNewClientAction newClientHook(struct _rfbClientRec *cl)
}
static Bool passwordCheck(rfbClientPtr cl,
char* encryptedPassword,
const char* encryptedPassword,
int len)
{
AppLocker a;

2
libvncserver/Makefile.am
View File

@@ -10,7 +10,7 @@ libvncserver_a_SOURCES = main.c rfbserver.c sraRegion.c auth.c sockets.c \
EXTRA_DIST = $(libvncserver_a_SOURCES) CHANGES COPYING \
README TODO
CFLAGS = @CFLAGS@ -DHAVE_PTHREADS -DALLOW24BPP
CFLAGS = @CFLAGS@ -DHAVE_PTHREADS -DALLOW24BPP -Wno-unused

7
libvncserver/cargs.c
View File

@@ -14,8 +14,7 @@
#include "rfb.h"
void
rfbUsage(void)
void rfbUsage(void)
{
fprintf(stderr, "-rfbport port TCP port for RFB protocol\n");
fprintf(stderr, "-rfbwait time max time in ms to wait for RFB client\n");
@@ -91,12 +90,14 @@ rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[])
*argc -= i-i1;
}
void rfbSizeUsage()
/*
static void rfbSizeUsage()
{
fprintf(stderr, "-width sets the width of the framebuffer\n");
fprintf(stderr, "-height sets the height of the framebuffer\n");
exit(1);
}
*/
void
rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[])

20
libvncserver/cursor.c
View File

@@ -143,7 +143,7 @@ rfbSendCursorShape(cl)
bpp2=cl->format.bitsPerPixel/8;
(*cl->translateFn)(cl->translateLookupTable,
&(cl->screen->rfbServerFormat),
&cl->format, pCursor->richSource,
&cl->format, (char*)pCursor->richSource,
&cl->updateBuf[cl->ublen],
pCursor->width*bpp1, pCursor->width, pCursor->height);
@@ -230,18 +230,18 @@ rfbCursorPtr rfbMakeXCursor(int width,int height,char* cursorString,char* maskSt
/*cursor->backRed=cursor->backGreen=cursor->backBlue=0xffff;*/
cursor->foreRed=cursor->foreGreen=cursor->foreBlue=0xffff;
cursor->source = (char*)calloc(w,height);
cursor->source = (unsigned char*)calloc(w,height);
for(j=0,cp=cursorString;j<height;j++)
for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
if(*cp!=' ') cursor->source[j*w+i/8]|=bit;
if(maskString) {
cursor->mask = (char*)calloc(w,height);
cursor->mask = (unsigned char*)calloc(w,height);
for(j=0,cp=maskString;j<height;j++)
for(i=0,bit=0x80;i<width;i++,bit=(bit&1)?0x80:bit>>1,cp++)
if(*cp!=' ') cursor->mask[j*w+i/8]|=bit;
} else
cursor->mask = rfbMakeMaskForXCursor(width,height,cursor->source);
cursor->mask = (unsigned char*)rfbMakeMaskForXCursor(width,height,(char*)cursor->source);
return(cursor);
}
@@ -289,7 +289,7 @@ void MakeXCursorFromRichCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor)
char *back=(char*)&background;
unsigned char bit;
cursor->source=(char*)calloc(w,cursor->height);
cursor->source=(unsigned char*)calloc(w,cursor->height);
if(format->bigEndian)
back+=4-bpp;
@@ -311,8 +311,9 @@ void MakeRichCursorFromXCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr cursor)
char *cp,*back=(char*)&background,*fore=(char*)&foreground;
unsigned char bit;
cp=cursor->richSource=(char*)calloc(cursor->width*bpp,cursor->height);
cp=(char*)calloc(cursor->width*bpp,cursor->height);
cursor->richSource = (unsigned char*) cp;
if(format->bigEndian) {
back+=4-bpp;
fore+=4-bpp;
@@ -434,8 +435,8 @@ void rfbDrawCursor(rfbScreenInfoPtr s)
}
/* for debugging */
void rfbPrintXCursor(rfbCursorPtr cursor)
/*
static void rfbPrintXCursor(rfbCursorPtr cursor)
{
int i,i1,j,w=(cursor->width+7)/8;
unsigned char bit;
@@ -448,6 +449,7 @@ void rfbPrintXCursor(rfbCursorPtr cursor)
putchar('\n');
}
}
*/
extern void rfbSetCursor(rfbScreenInfoPtr rfbScreen,rfbCursorPtr c,Bool freeOld)
{

8
libvncserver/font.c
View File

@@ -34,7 +34,7 @@ int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
}
void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,const unsigned char* string,Pixel colour)
int x,int y,const char* string,Pixel colour)
{
while(*string) {
x+=rfbDrawChar(rfbScreen,font,x,y,*string,colour);
@@ -100,7 +100,7 @@ int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
}
void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
int x,int y,const unsigned char* string,
int x,int y,const char* string,
int x1,int y1,int x2,int y2,
Pixel colour,Pixel backColour)
{
@@ -111,7 +111,7 @@ void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,
}
}
int rfbWidthOfString(rfbFontDataPtr font,const unsigned char* string)
int rfbWidthOfString(rfbFontDataPtr font,const char* string)
{
int i=0;
while(*string) {
@@ -166,7 +166,7 @@ rfbFontDataPtr rfbLoadConsoleFont(char *filename)
if(!f) return(0);
p=(rfbFontDataPtr)malloc(sizeof(rfbFontData));
p->data=(char*)malloc(4096);
p->data=(unsigned char*)malloc(4096);
if(1!=fread(p->data,4096,1,f)) {
free(p->data);
free(p);

9
libvncserver/hextile.c
View File

@@ -296,13 +296,8 @@ subrectEncode##bpp(rfbClientPtr cl, CARD##bpp *data, int w, int h,
*/ \
\
static void \
testColours##bpp(data,size,mono,solid,bg,fg) \
CARD##bpp *data; \
int size; \
Bool *mono; \
Bool *solid; \
CARD##bpp *bg; \
CARD##bpp *fg; \
testColours##bpp(CARD##bpp *data, int size, Bool *mono, Bool *solid, \
CARD##bpp *bg, CARD##bpp* fg) \
{ \
CARD##bpp colour1 = 0, colour2 = 0; \
int n1 = 0, n2 = 0; \

8
libvncserver/httpd.c
View File

@@ -47,7 +47,7 @@
#define OK_STR "HTTP/1.0 200 OK\nContent-Type: text/html\n\n"
static void httpProcessInput();
static void httpProcessInput(rfbScreenInfoPtr rfbScreen);
static Bool compareAndSkip(char **ptr, const char *str);
/*
@@ -108,7 +108,7 @@ httpCheckFds(rfbScreenInfoPtr rfbScreen)
fd_set fds;
struct timeval tv;
struct sockaddr_in addr;
int addrlen = sizeof(addr);
socklen_t addrlen = sizeof(addr);
if (!rfbScreen->httpDir)
return;
@@ -175,7 +175,7 @@ static void
httpProcessInput(rfbScreenInfoPtr rfbScreen)
{
struct sockaddr_in addr;
int addrlen = sizeof(addr);
socklen_t addrlen = sizeof(addr);
char fullFname[256];
char *fname;
unsigned int maxFnameLen;
@@ -273,7 +273,7 @@ httpProcessInput(rfbScreenInfoPtr rfbScreen)
/* Open the file */
if ((fd = fopen(fullFname, "r")) <= 0) {
if (!(fd = fopen(fullFname, "r"))) {
rfbLogPerror("httpProcessInput: open");
WriteExact(&cl, NOT_FOUND_STR, strlen(NOT_FOUND_STR));
httpCloseSock(rfbScreen);

13
libvncserver/main.c
View File

@@ -306,13 +306,13 @@ listenerRun(void *data)
int client_fd;
struct sockaddr_in peer;
rfbClientPtr cl;
int len;
socklen_t len;
if (rfbScreen->inetdSock != -1) {
cl = rfbNewClient(rfbScreen, rfbScreen->inetdSock);
if (cl && !cl->onHold )
rfbStartOnHoldClient(cl);
return;
return 0;
}
len = sizeof(peer);
@@ -325,6 +325,7 @@ listenerRun(void *data)
if (cl && !cl->onHold )
rfbStartOnHoldClient(cl);
}
return 0;
}
void
@@ -370,7 +371,7 @@ defaultPtrAddEvent(int buttonMask, int x, int y, rfbClientPtr cl)
}
}
void defaultSetXCutText(char* text, int len, rfbClientPtr cl)
static void defaultSetXCutText(char *text, int len, rfbClientPtr cl)
{
}
@@ -403,13 +404,13 @@ static rfbCursor myCursor =
};
#endif
rfbCursorPtr defaultGetCursorPtr(rfbClientPtr cl)
static rfbCursorPtr defaultGetCursorPtr(rfbClientPtr cl)
{
return(cl->screen->cursor);
}
/* response is cl->authChallenge vncEncrypted with passwd */
Bool defaultPasswordCheck(rfbClientPtr cl,char* response,int len)
static Bool defaultPasswordCheck(rfbClientPtr cl,char* response,int len)
{
int i;
char *passwd=vncDecryptPasswdFromFile(cl->screen->rfbAuthPasswdData);
@@ -439,7 +440,7 @@ Bool defaultPasswordCheck(rfbClientPtr cl,char* response,int len)
/* for this method, rfbAuthPasswdData is really a pointer to an array
of char*'s, where the last pointer is 0. */
Bool rfbCheckPasswordByList(rfbClientPtr cl,char* response,int len)
Bool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len)
{
char **passwds;

22
libvncserver/rfb.h
View File

@@ -172,7 +172,7 @@ typedef void (*PtrAddEventProcPtr) (int buttonMask, int x, int y, struct _rfbCli
typedef void (*SetXCutTextProcPtr) (char* str,int len, struct _rfbClientRec* cl);
typedef struct rfbCursor* (*GetCursorProcPtr) (struct _rfbClientRec* pScreen);
typedef Bool (*SetTranslateFunctionProcPtr)(struct _rfbClientRec* cl);
typedef Bool (*PasswordCheckProcPtr)(struct _rfbClientRec* cl,char* encryptedPassWord,int len);
typedef Bool (*PasswordCheckProcPtr)(struct _rfbClientRec* cl,const char* encryptedPassWord,int len);
typedef enum rfbNewClientAction (*NewClientHookPtr)(struct _rfbClientRec* cl);
typedef void (*DisplayHookPtr)(struct _rfbClientRec* cl);
@@ -254,7 +254,7 @@ typedef struct _rfbScreenInfo
rfbPixelFormat rfbServerFormat;
rfbColourMap colourMap; /* set this if rfbServerFormat.trueColour==FALSE */
char* desktopName;
const char* desktopName;
char rfbThisHost[255];
Bool autoPort;
@@ -553,7 +553,7 @@ extern void rfbInitSockets(rfbScreenInfoPtr rfbScreen);
extern void rfbDisconnectUDPSock(rfbScreenInfoPtr rfbScreen);
extern void rfbCloseClient(rfbClientPtr cl);
extern int ReadExact(rfbClientPtr cl, char *buf, int len);
extern int WriteExact(rfbClientPtr cl, char *buf, int len);
extern int WriteExact(rfbClientPtr cl, const char *buf, int len);
extern void rfbCheckFds(rfbScreenInfoPtr rfbScreen,long usec);
extern int rfbConnect(rfbScreenInfoPtr rfbScreen, char* host, int port);
extern int ConnectToTcpAddr(char* host, int port);
@@ -616,8 +616,8 @@ extern void rfbSetClientColourMaps(rfbScreenInfoPtr rfbScreen, int firstColour,
extern int httpPort;
extern char *httpDir;
extern void httpInitSockets();
extern void httpCheckFds();
extern void httpInitSockets(rfbScreenInfoPtr rfbScreen);
extern void httpCheckFds(rfbScreenInfoPtr rfbScreen);
@@ -715,11 +715,11 @@ typedef struct rfbFontData {
} rfbFontData,* rfbFontDataPtr;
int rfbDrawChar(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,Pixel colour);
void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const unsigned char* string,Pixel colour);
void rfbDrawString(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,Pixel colour);
/* if colour==backColour, background is transparent */
int rfbDrawCharWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,unsigned char c,int x1,int y1,int x2,int y2,Pixel colour,Pixel backColour);
void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const unsigned char* string,int x1,int y1,int x2,int y2,Pixel colour,Pixel backColour);
int rfbWidthOfString(rfbFontDataPtr font,const unsigned char* string);
void rfbDrawStringWithClip(rfbScreenInfoPtr rfbScreen,rfbFontDataPtr font,int x,int y,const char* string,int x1,int y1,int x2,int y2,Pixel colour,Pixel backColour);
int rfbWidthOfString(rfbFontDataPtr font,const char* string);
int rfbWidthOfChar(rfbFontDataPtr font,unsigned char c);
void rfbFontBBox(rfbFontDataPtr font,unsigned char c,int* x1,int* y1,int* x2,int* y2);
/* this returns the smallest box enclosing any character of font. */
@@ -743,7 +743,7 @@ void rfbDrawLine(rfbScreenInfoPtr s,int x1,int y1,int x2,int y2,Pixel col);
with a NULL.
It returns the index in the list or -1 if cancelled or something else
wasn't kosher. */
typedef void (*SelectionChangedHookPtr)(int index);
typedef void (*SelectionChangedHookPtr)(int);
extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen,
rfbFontDataPtr font, char** list,
int x1, int y1, int x2, int y2,
@@ -752,7 +752,7 @@ extern int rfbSelectBox(rfbScreenInfoPtr rfbScreen,
/* cargs.c */
extern void rfbUsage();
extern void rfbUsage(void);
extern void rfbProcessArguments(rfbScreenInfoPtr rfbScreen,int* argc, char *argv[]);
extern void rfbProcessSizeArguments(int* width,int* height,int* bpp,int* argc, char *argv[]);
@@ -774,7 +774,7 @@ void doNothingWithClient(rfbClientPtr cl);
enum rfbNewClientAction defaultNewClientHook(rfbClientPtr cl);
/* to check against plain passwords */
Bool rfbCheckPasswordByList(rfbClientPtr cl,char* response,int len);
Bool rfbCheckPasswordByList(rfbClientPtr cl,const char* response,int len);
/* functions to make a vnc server */
extern rfbScreenInfoPtr rfbGetScreen(int* argc,char** argv,

14
libvncserver/rfbserver.c
View File

@@ -56,14 +56,14 @@ static void rfbProcessClientNormalMessage(rfbClientPtr cl);
static void rfbProcessClientInitMessage(rfbClientPtr cl);
#ifdef HAVE_PTHREADS
void rfbIncrClientRef(rfbClientPtr cl)
static void rfbIncrClientRef(rfbClientPtr cl)
{
LOCK(cl->refCountMutex);
cl->refCount++;
UNLOCK(cl->refCountMutex);
}
void rfbDecrClientRef(rfbClientPtr cl)
static void rfbDecrClientRef(rfbClientPtr cl)
{
LOCK(cl->refCountMutex);
cl->refCount--;
@@ -179,7 +179,7 @@ rfbReverseConnection(rfbScreen,host, port)
* means.
*/
rfbClientPtr
static rfbClientPtr
rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbScreenInfoPtr rfbScreen;
int sock;
@@ -189,7 +189,7 @@ rfbNewTCPOrUDPClient(rfbScreen,sock,isUDP)
rfbClientIteratorPtr iterator;
rfbClientPtr cl,cl_;
struct sockaddr_in addr;
int addrlen = sizeof(struct sockaddr_in);
socklen_t addrlen = sizeof(struct sockaddr_in);
int i;
cl = (rfbClientPtr)calloc(sizeof(rfbClientRec),1);
@@ -526,7 +526,7 @@ rfbProcessClientInitMessage(cl)
si->format.blueMax = Swap16IfLE(si->format.blueMax);
if (strlen(cl->screen->desktopName) > 128) /* sanity check on desktop name len */
cl->screen->desktopName[128] = 0;
((char*)cl->screen->desktopName)[128] = 0;
strcpy(buf + sz_rfbServerInitMsg, cl->screen->desktopName);
len = strlen(buf + sz_rfbServerInitMsg);
@@ -1430,9 +1430,7 @@ rfbSendServerCutText(rfbScreenInfoPtr rfbScreen,char *str, int len)
unsigned char ptrAcceleration = 50;
void
rfbNewUDPConnection(rfbScreen,sock)
rfbScreenInfoPtr rfbScreen;
int sock;
rfbNewUDPConnection(rfbScreenInfoPtr rfbScreen, int sock)
{
if (write(sock, &ptrAcceleration, 1) < 0) {
rfbLogPerror("rfbNewUDPConnection: write");

22
libvncserver/selbox.c
View File

@@ -66,17 +66,17 @@ static void selPaintLine(rfbSelectData* m,int line,Bool invert)
invert?m->backColour:m->colour);
}
static void selSelect(rfbSelectData* m,int index)
static void selSelect(rfbSelectData* m,int indexs)
{
int delta;
if(index==m->selected || index<0 || index>=m->listSize)
if(indexs==m->selected || indexs<0 || indexs>=m->listSize)
return;
if(m->selected>=0)
selPaintLine(m,m->selected-m->displayStart,FALSE);
if(index<m->displayStart || index>=m->displayStart+m->pageH) {
if(indexs<m->displayStart || indexs>=m->displayStart+m->pageH) {
/* targetLine is the screen line in which the selected line will
be displayed.
targetLine = m->pageH/2 doesn't look so nice */
@@ -84,11 +84,11 @@ static void selSelect(rfbSelectData* m,int index)
int lineStart,lineEnd;
/* scroll */
if(index<targetLine)
targetLine = index;
else if(index+m->pageH-targetLine>=m->listSize)
targetLine = index+m->pageH-m->listSize;
delta = index-(m->displayStart+targetLine);
if(indexs<targetLine)
targetLine = indexs;
else if(indexs+m->pageH-targetLine>=m->listSize)
targetLine = indexs+m->pageH-m->listSize;
delta = indexs-(m->displayStart+targetLine);
if(delta>-m->pageH && delta<m->pageH) {
if(delta>0) {
@@ -109,15 +109,15 @@ static void selSelect(rfbSelectData* m,int index)
}
m->displayStart += delta;
for(delta=lineStart;delta<lineEnd;delta++)
if(delta!=index)
if(delta!=indexs)
selPaintLine(m,delta,FALSE);
}
m->selected = index;
m->selected = indexs;
selPaintLine(m,m->selected-m->displayStart,TRUE);
if(m->selChangedHook)
m->selChangedHook(index);
m->selChangedHook(indexs);
/* todo: scrollbars */
}

4
libvncserver/sockets.c
View File

@@ -412,7 +412,7 @@ ReadExact(cl, buf, len)
int
WriteExact(cl, buf, len)
rfbClientPtr cl;
char *buf;
const char *buf;
int len;
{
int sock = cl->sock;
@@ -519,7 +519,7 @@ ConnectToTcpAddr(host, port)
addr.sin_family = AF_INET;
addr.sin_port = htons(port);
if ((addr.sin_addr.s_addr = inet_addr(host)) == -1)
if ((addr.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE)
{
if (!(hp = gethostbyname(host))) {
errno = EINVAL;

52
libvncserver/sraRegion.c
View File

@@ -33,7 +33,7 @@ typedef struct sraRegion {
sraSpanList *sraSpanListDup(const sraSpanList *src);
void sraSpanListDestroy(sraSpanList *list);
sraSpan *
static sraSpan *
sraSpanCreate(int start, int end, const sraSpanList *subspan) {
sraSpan *item = (sraSpan*)malloc(sizeof(sraSpan));
item->_next = item->_prev = NULL;
@@ -43,7 +43,7 @@ sraSpanCreate(int start, int end, const sraSpanList *subspan) {
return item;
}
sraSpan *
static sraSpan *
sraSpanDup(const sraSpan *src) {
sraSpan *span;
if (!src) return NULL;
@@ -51,7 +51,7 @@ sraSpanDup(const sraSpan *src) {
return span;
}
void
static void
sraSpanInsertAfter(sraSpan *newspan, sraSpan *after) {
newspan->_next = after->_next;
newspan->_prev = after;
@@ -59,7 +59,7 @@ sraSpanInsertAfter(sraSpan *newspan, sraSpan *after) {
after->_next = newspan;
}
void
static void
sraSpanInsertBefore(sraSpan *newspan, sraSpan *before) {
newspan->_next = before;
newspan->_prev = before->_prev;
@@ -67,33 +67,35 @@ sraSpanInsertBefore(sraSpan *newspan, sraSpan *before) {
before->_prev = newspan;
}
void
static void
sraSpanRemove(sraSpan *span) {
span->_prev->_next = span->_next;
span->_next->_prev = span->_prev;
}
void
static void
sraSpanDestroy(sraSpan *span) {
if (span->subspan) sraSpanListDestroy(span->subspan);
free(span);
}
void
/*
static void
sraSpanCheck(const sraSpan *span, const char *text) {
/* Check the span is valid! */
// Check the span is valid!
if (span->start == span->end) {
printf(text);
printf(":%d-%d\n", span->start, span->end);
exit(0);
}
}
*/
/* -=- SpanList routines */
void sraSpanPrint(const sraSpan *s);
void
static void
sraSpanListPrint(const sraSpanList *l) {
sraSpan *curr;
if (!l) {
@@ -116,7 +118,7 @@ sraSpanPrint(const sraSpan *s) {
sraSpanListPrint(s->subspan);
}
sraSpanList *
static sraSpanList *
sraSpanListCreate() {
sraSpanList *item = (sraSpanList*)malloc(sizeof(sraSpanList));
item->front._next = &(item->back);
@@ -156,7 +158,7 @@ sraSpanListDestroy(sraSpanList *list) {
free(list);
}
void
static void
sraSpanListMakeEmpty(sraSpanList *list) {
sraSpan *curr, *next;
while (list->front._next != &(list->back)) {
@@ -172,10 +174,12 @@ sraSpanListMakeEmpty(sraSpanList *list) {
list->back._next = NULL;
}
int sraMax(int a, int b) {return (a>b)?a:b;}
int sraMin(int a, int b) {return (a<b)?a:b;}
/*
static int sraMax(int a, int b) {return (a>b)?a:b;}
static int sraMin(int a, int b) {return (a<b)?a:b;}
*/
Bool
static Bool
sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
sraSpan *sp1, *sp2;
@@ -208,12 +212,12 @@ sraSpanListEqual(const sraSpanList *s1, const sraSpanList *s2) {
}
}
Bool
static Bool
sraSpanListEmpty(const sraSpanList *list) {
return (list->front._next == &(list->back));
}
unsigned long
static unsigned long
sraSpanListCount(const sraSpanList *list) {
sraSpan *curr = list->front._next;
unsigned long count = 0;
@@ -228,7 +232,7 @@ sraSpanListCount(const sraSpanList *list) {
return count;
}
void
static void
sraSpanMergePrevious(sraSpan *dest) {
sraSpan *prev = dest->_prev;
while ((prev->end == dest->start) &&
@@ -248,7 +252,7 @@ sraSpanMergePrevious(sraSpan *dest) {
}
}
void
static void
sraSpanMergeNext(sraSpan *dest) {
sraSpan *next = dest->_next;
while ((next->start == dest->end) &&
@@ -268,7 +272,7 @@ sraSpanMergeNext(sraSpan *dest) {
}
}
void
static void
sraSpanListOr(sraSpanList *dest, const sraSpanList *src) {
sraSpan *d_curr, *s_curr;
int s_start, s_end;
@@ -358,7 +362,7 @@ sraSpanListOr(sraSpanList *dest, const sraSpanList *src) {
}
}
Bool
static Bool
sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
sraSpan *d_curr, *s_curr, *d_next;
@@ -438,7 +442,7 @@ sraSpanListAnd(sraSpanList *dest, const sraSpanList *src) {
return !sraSpanListEmpty(dest);
}
Bool
static Bool
sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) {
sraSpan *d_curr, *s_curr;
@@ -511,7 +515,7 @@ sraSpanListSubtract(sraSpanList *dest, const sraSpanList *src) {
/* -=- Region routines */
sraRegion *
sraRegion*
sraRgnCreate() {
return (sraRegion*)sraSpanListCreate();
}
@@ -692,13 +696,13 @@ sraRectangleIterator *sraRgnGetReverseIterator(sraRegion *s,Bool reverseX,Bool r
return(i);
}
Bool sraReverse(sraRectangleIterator *i)
static Bool sraReverse(sraRectangleIterator *i)
{
return( ((i->ptrPos&2) && i->reverseX) ||
(!(i->ptrPos&2) && i->reverseY));
}
sraSpan* sraNextSpan(sraRectangleIterator *i)
static sraSpan* sraNextSpan(sraRectangleIterator *i)
{
if(sraReverse(i))
return(i->sPtrs[i->ptrPos]->_prev);

1
libvncserver/sraRegion.h
View File

@@ -1,3 +1,4 @@
#ifndef SRAREGION_H
#define SRAREGION_H

2
libvncserver/stats.c
View File

@@ -27,7 +27,7 @@
#include <stdlib.h>
#include "rfb.h"
static char* encNames[] = {
static const char* encNames[] = {
"raw", "copyRect", "RRE", "[encoding 3]", "CoRRE", "hextile",
"zlib", "tight", "[encoding 8]", "[encoding 9]"
};

2
libvncserver/tableinit24.c
View File

@@ -34,7 +34,7 @@ rfbInitColourMapSingleTable24(char **table, rfbPixelFormat *in,
CARD32 i, r, g, b, outValue;
CARD8 *t;
CARD8 c;
int nEntries = 1 << in->bitsPerPixel;
unsigned int nEntries = 1 << in->bitsPerPixel;
int shift = colourMap->is16?16:8;
if (*table) free(*table);

2
libvncserver/tight.c
View File

@@ -451,7 +451,7 @@ CheckSolidTile(cl, x, y, w, h, colorPtr, needSameColor)
static Bool \
CheckSolidTile##bpp(cl, x, y, w, h, colorPtr, needSameColor) \
rfbClientPtr cl; \
int x, y; \
int x, y, w, h; \
CARD32 *colorPtr; \
Bool needSameColor; \
{ \

7
libvncserver/translate.c
View File

@@ -29,7 +29,7 @@
#include "sraRegion.h"
static void PrintPixelFormat(rfbPixelFormat *pf);
static Bool rfbSetClientColourMapBGR233();
static Bool rfbSetClientColourMapBGR233(rfbClientPtr cl);
Bool rfbEconomicTranslate = FALSE;
@@ -38,7 +38,7 @@ Bool rfbEconomicTranslate = FALSE;
*/
static const rfbPixelFormat BGR233Format = {
8, 8, 0, 1, 7, 7, 3, 0, 3, 6
8, 8, 0, 1, 7, 7, 3, 0, 3, 6, 0, 0
};
@@ -359,8 +359,7 @@ rfbSetTranslateFunction(cl)
*/
static Bool
rfbSetClientColourMapBGR233(cl)
rfbClientPtr cl;
rfbSetClientColourMapBGR233(rfbClientPtr cl)
{
char buf[sz_rfbSetColourMapEntriesMsg + 256 * 3 * 2];
rfbSetColourMapEntriesMsg *scme = (rfbSetColourMapEntriesMsg *)buf;