This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gokdrive. commit 82d89428d27388629e96781f3d7a8ae40271b340 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Jul 16 14:17:29 2019 +0200 x2gokdrive*.{c|h}: Comment out dead code (needs to be removed later) that throws compiler warnings. --- x2gokdrivecursor.c | 6 +++--- x2gokdriveinit.c | 12 ++++++------ x2gokdriveremote.c | 25 +++++++++++++++---------- x2gokdriveremote.h | 4 ++-- 4 files changed, 26 insertions(+), 21 deletions(-) diff --git a/x2gokdrivecursor.c b/x2gokdrivecursor.c index dd46f7e..37abc0a 100644 --- a/x2gokdrivecursor.c +++ b/x2gokdrivecursor.c @@ -72,9 +72,9 @@ can_argb_cursor(void) static Bool ephyrRealizeCursor(DeviceIntPtr dev, ScreenPtr screen, CursorPtr cursor) { - KdScreenPriv(screen); - KdScreenInfo *kscr = pScreenPriv->screen; - EphyrScrPriv *scr = kscr->driver; +// KdScreenPriv(screen); +// KdScreenInfo *kscr = pScreenPriv->screen; +// EphyrScrPriv *scr = kscr->driver; return TRUE; } diff --git a/x2gokdriveinit.c b/x2gokdriveinit.c index 8951c5f..f01685d 100644 --- a/x2gokdriveinit.c +++ b/x2gokdriveinit.c @@ -179,8 +179,8 @@ processScreenOrOutputArg(const char *screen_size, const char *output, char *pare if (card) { KdScreenInfo *screen; - unsigned long p_id = 0; - Bool use_geometry; +// unsigned long p_id = 0; +// Bool use_geometry; screen = KdScreenInfoAdd(card); KdParseScreen(screen, screen_size); @@ -188,11 +188,11 @@ processScreenOrOutputArg(const char *screen_size, const char *output, char *pare if (!screen->driver) FatalError("Couldn't alloc screen private\n"); - if (parent_id) { - p_id = strtol(parent_id, NULL, 0); - } +// if (parent_id) { +// p_id = strtol(parent_id, NULL, 0); +// } - use_geometry = (strchr(screen_size, '+') != NULL); +// use_geometry = (strchr(screen_size, '+') != NULL); EPHYR_DBG("screen number:%d, size: %s, output %s\n", screen->mynum, screen_size, output); // hostx_add_screen(screen, p_id, screen->mynum, use_geometry, output); } diff --git a/x2gokdriveremote.c b/x2gokdriveremote.c index d638d48..ebbd128 100644 --- a/x2gokdriveremote.c +++ b/x2gokdriveremote.c @@ -308,7 +308,7 @@ int32_t send_cursor(struct cursorFrame* cursor) // EPHYR_DBG("SENDING CURSOR %d with size %d", cursor->serialNumber, cursor->size); - #warning check this +// #warning check this int ln=write(remoteVars.clientsock,buffer,56); int sent=0; @@ -355,7 +355,7 @@ int32_t send_frame(u_int32_t width, uint32_t height, uint32_t x, uint32_t y, uin else EPHYR_DBG("SENDING REFERENCE %x", crc);*/ -#warning check this +// #warning check this int ln=write(remoteVars.clientsock, buffer,56); uint32_t total=0; for(int i=0;i<9;++i) @@ -379,7 +379,7 @@ int32_t send_frame(u_int32_t width, uint32_t height, uint32_t x, uint32_t y, uin *((uint32_t*)buffer+6)=regions[i].rect.size.height; *((uint32_t*)buffer+7)=regions[i].size; - #warning check this +// #warning check this int ln=write(remoteVars.clientsock, buffer, 64); int sent=0; @@ -417,7 +417,7 @@ int send_deleted_elements(void) *((uint32_t*)buffer)=DELETED; *((uint32_t*)buffer+1)=remoteVars.deleted_list_size; - #warning check this +// #warning check this int ln=write(remoteVars.clientsock,buffer,56); // data_sent+=48; int sent=0; @@ -460,7 +460,7 @@ int send_deleted_cursors(void) *((uint32_t*)buffer)=DELETEDCURSOR; *((uint32_t*)buffer+1)=remoteVars.deletedcursor_list_size; - #warning check this +// #warning check this int ln=write(remoteVars.clientsock,buffer,56); int sent=0; @@ -504,7 +504,7 @@ int send_selection(int sel, char* data, uint32_t length, uint32_t format) *((uint32_t*)buffer+2)=format; *((uint32_t*)buffer+3)=length; - #warning check this +// #warning check this int ln=write(remoteVars.clientsock,buffer,56); int sent=0; @@ -2732,8 +2732,9 @@ void initFrameRegions(struct cache_elem* frame) regions[i].rect.size.width,regions[i].rect.size.height); */ - #warning check this +// #warning check this uint8_t *data=malloc(regions[i].rect.size.width*regions[i].rect.size.height*CACHEBPP); + for(int line=0;line<regions[i].rect.size.height;++line) { memcpy(data+line*regions[i].rect.size.width*CACHEBPP, @@ -2752,8 +2753,9 @@ void initFrameRegions(struct cache_elem* frame) } else { - #warning check this +// #warning check this uint8_t *data=malloc(regions[1].rect.size.width*regions[1].rect.size.height*CACHEBPP); + for(int line=0;line<regions[1].rect.size.height;++line) { memcpy(data+line*regions[1].rect.size.width*CACHEBPP, @@ -2945,7 +2947,9 @@ remote_paint_rect(KdScreenInfo *screen, width=dirtyx_max-dirtyx_min+1; height=dirtyy_max-dirtyy_min+1; - int oldsize=size; + /* + * int oldsize=size; + */ size=width*height*XSERVERBPP; if(width<=0 || height<=0||size<=0) { @@ -2958,7 +2962,8 @@ remote_paint_rect(KdScreenInfo *screen, * if(size!=oldsize) * { * EPHYR_DBG("new update rect demensions: %dx%d", width, height); - }*/ + * } + */ add_frame(width, height, dx, dy, calculate_crc(width, height,dx,dy), size); } diff --git a/x2gokdriveremote.h b/x2gokdriveremote.h index 8f5dab1..df84661 100644 --- a/x2gokdriveremote.h +++ b/x2gokdriveremote.h @@ -92,7 +92,7 @@ #define EPHYR_WANT_DEBUG 1 -#warning DEBUG ENABLED +// #warning DEBUG ENABLED #if (EPHYR_WANT_DEBUG) @@ -328,7 +328,7 @@ struct RemoteHostVars KdScreenInfo* ephyrScreen; uint32_t main_img_height, main_img_width; - #warning remove this hack +// #warning remove this hack int numofimg; int clientsock, serversock; -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gokdrive.git