[X2Go-Commits] [x2gokdrive] 12/12: x2gokdrive*.c: Remove unused variables (or mark them with _X_UNUSED).

git-admin at x2go.org git-admin at x2go.org
Tue Jul 16 17:09:21 CEST 2019


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2gokdrive.

commit bc93ad994d50a235672315c06c398844b281f6c9
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jul 16 17:08:55 2019 +0200

    x2gokdrive*.c: Remove unused variables (or mark them with _X_UNUSED).
---
 x2gokdrive.c       | 10 +---------
 x2gokdriveremote.c |  9 +--------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/x2gokdrive.c b/x2gokdrive.c
index 4de4779..2be5bfe 100644
--- a/x2gokdrive.c
+++ b/x2gokdrive.c
@@ -96,8 +96,6 @@ Bool
 ephyrScreenInitialize(KdScreenInfo *screen)
 {
     EphyrScrPriv *scrpriv = screen->driver;
-    int x = 0, y = 0;
-    int width = 640, height = 480;
     CARD32 redMask, greenMask, blueMask;
 
     EPHYR_DBG("Init screen");
@@ -683,7 +681,7 @@ void setOutput(ScreenPtr pScreen, RROutputPtr output, RRCrtcPtr crtc, int width,
     else
         RROutputSetConnection(output, RR_Disconnected);
 
-    RRModePtr mode, newMode = NULL;
+    RRModePtr mode = NULL;
 
     xRRModeInfo modeInfo;
     RRModePtr *modes;
@@ -779,7 +777,6 @@ void addOutput(ScreenPtr pScreen, char* name, int width, int height, int x, int
 {
 
     RROutputPtr output;
-    int n = 0;
 
     /* add new Output */
     EPHYR_DBG("CREATE OUTPUT %s",name);
@@ -904,7 +901,6 @@ Bool
 ephyrInitScreen(ScreenPtr pScreen)
 {
     KdScreenPriv(pScreen);
-    KdScreenInfo *screen = pScreenPriv->screen;
 
     EPHYR_LOG("pScreen->myNum:%d\n", pScreen->myNum);
     pScreen->CreateColormap = ephyrCreateColormap;
@@ -1442,10 +1438,6 @@ KdPointerDriver EphyrMouseDriver = {
 static Status
 EphyrKeyboardInit(KdKeyboardInfo * ki)
 {
-    KeySymsRec keySyms;
-    CARD8 modmap[MAP_LENGTH];
-    XkbControlsRec controls;
-
     ki->driverPrivate = (EphyrKbdPrivate *)
         calloc(sizeof(EphyrKbdPrivate), 1);
 
diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c
index f27bf37..8bc4329 100644
--- a/x2gokdriveremote.c
+++ b/x2gokdriveremote.c
@@ -1275,9 +1275,7 @@ BOOL find_common_regions(struct cache_elem* source, struct cache_elem* dest, BOO
 static
 void sendMainImageFromSendThread(uint32_t width, uint32_t height, int32_t dx ,int32_t dy)
 {
-    uint32_t length = 0;
-    char fname[255] = {0};
-    char* f = NULL;
+    _X_UNUSED uint32_t length = 0;
     struct frame_region regions[9] = {0};
 
     uint32_t isize = 0;
@@ -1372,8 +1370,6 @@ void *send_frame_thread (void *threadid)
         {
             struct addrinfo hints, *res;
             int errcode;
-            char addrstr[100];
-            void *ptr;
 
             memset (&hints, 0, sizeof (hints));
             hints.ai_family = AF_INET;
@@ -1567,7 +1563,6 @@ void *send_frame_thread (void *threadid)
                     uint32_t crc = frame->crc;
                     uint32_t width=frame->width;
                     uint32_t height=frame->height;
-                    BOOL show_time=FALSE;
 
                     /* unlock sendqueue for main thread */
                     pthread_mutex_unlock(&remoteVars.sendqueue_mutex);
@@ -1982,7 +1977,6 @@ clientReadNotify(int fd, int ready, void *data)
                 {
                     uint16_t width=*((uint16_t*)buff+2);
                     uint16_t height=*((uint16_t*)buff+3);
-                    uint8_t primaryInd=*((uint8_t*)buff+8);
                     struct VirtScreen screens[4] = {0};
 
                     remoteVars.client_initialized=TRUE;
@@ -2118,7 +2112,6 @@ unsigned int checkSocketConnection(OsTimerPtr timer, CARD32 time, void* args)
 
 void open_socket(void)
 {
-    ssize_t size;
     const int y = 1;
     int ret = -1;
 

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git


More information about the x2go-commits mailing list