diff options
| author | Christian Beier <dontmind@freeshell.org> | 2012-04-25 13:36:25 +0200 |
|---|---|---|
| committer | Christian Beier <dontmind@freeshell.org> | 2012-04-25 13:36:25 +0200 |
| commit | 6f9a9160c4006aecfc8ca5248e7e4bf8154aff62 (patch) | |
| tree | d431846a3e07b4bf8a71a6934959178392476b49 | |
| parent | 413ca0dfef83b98f7b230e0596ac086d42eaad4e (diff) | |
| download | libtdevnc-6f9a9160c4006aecfc8ca5248e7e4bf8154aff62.tar.gz libtdevnc-6f9a9160c4006aecfc8ca5248e7e4bf8154aff62.zip | |
Fix some compiler warnings thrown with newer gcc.
| -rw-r--r-- | common/turbojpeg.c | 1 | ||||
| -rw-r--r-- | libvncserver/rfbserver.c | 4 | ||||
| -rw-r--r-- | libvncserver/websockets.c | 5 | ||||
| -rw-r--r-- | test/tjbench.c | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/common/turbojpeg.c b/common/turbojpeg.c index b3877ec..f7b9245 100644 --- a/common/turbojpeg.c +++ b/common/turbojpeg.c @@ -108,6 +108,7 @@ static const tjscalingfactor sf[NUMSF]={ retval=-1; goto bailout;} #define getinstance(handle) tjinstance *this=(tjinstance *)handle; \ j_compress_ptr cinfo=NULL; j_decompress_ptr dinfo=NULL; \ + (void) cinfo; (void) dinfo; /* silence warnings */ \ if(!this) {snprintf(errStr, JMSG_LENGTH_MAX, "Invalid handle"); \ return -1;} \ cinfo=&this->cinfo; dinfo=&this->dinfo; diff --git a/libvncserver/rfbserver.c b/libvncserver/rfbserver.c index e18f31d..316f5ba 100644 --- a/libvncserver/rfbserver.c +++ b/libvncserver/rfbserver.c @@ -228,9 +228,7 @@ void rfbNewClientConnection(rfbScreenInfoPtr rfbScreen, int sock) { - rfbClientPtr cl; - - cl = rfbNewClient(rfbScreen,sock); + rfbNewClient(rfbScreen,sock); } diff --git a/libvncserver/websockets.c b/libvncserver/websockets.c index 425bc15..8cd96d3 100644 --- a/libvncserver/websockets.c +++ b/libvncserver/websockets.c @@ -622,7 +622,8 @@ webSocketsDecodeHybi(rfbClientPtr cl, char *dst, int len) int i; unsigned char opcode; ws_ctx_t *wsctx = (ws_ctx_t *)cl->wsctx; - int flength, fin, fhlen; + int flength, fhlen; + /* int fin; */ /* not used atm */ // rfbLog(" <== %s[%d]: %d cl: %p, wsctx: %p-%p (%d)\n", __func__, gettid(), len, cl, wsctx, (char *)wsctx + sizeof(ws_ctx_t), sizeof(ws_ctx_t)); @@ -662,7 +663,7 @@ webSocketsDecodeHybi(rfbClientPtr cl, char *dst, int len) } opcode = header->b0 & 0x0f; - fin = (header->b0 & 0x80) >> 7; + /* fin = (header->b0 & 0x80) >> 7; */ /* not used atm */ flength = header->b1 & 0x7f; /* diff --git a/test/tjbench.c b/test/tjbench.c index b1f343f..29aa153 100644 --- a/test/tjbench.c +++ b/test/tjbench.c @@ -38,7 +38,8 @@ #define _throw(op, err) { \ printf("ERROR in line %d while %s:\n%s\n", __LINE__, op, err); \ - retval=-1; goto bailout;} + (void)retval; /* silence warning */ \ + retval=-1; goto bailout;} #define _throwunix(m) _throw(m, strerror(errno)) #define _throwtj(m) _throw(m, tjGetErrorStr()) #define _throwbmp(m) _throw(m, bmpgeterr()) |