Skip to content

N
nx-libs
You need to sign in or sign up before continuing.
Commit dbf36ece authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

nxagent: drop Holder.[ch]

The only left code was nxagentCheckum() which was not compiling anyway.
parent cbc9f831
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 120 deletions
nx-X11/programs/Xserver/hw/nxagent/GCOps.c
View file @ dbf36ece
...@@ -54,7 +54,6 @@ is" without express or implied warranty. ...@@ -54,7 +54,6 @@ is" without express or implied warranty.
#include "Events.h" #include "Events.h"
#include "Client.h" #include "Client.h"
#include "Trap.h" #include "Trap.h"
#include "Holder.h"
#include "Args.h" #include "Args.h"
#include "Screen.h" #include "Screen.h"
#include "Utils.h" #include "Utils.h"
......
nx-X11/programs/Xserver/hw/nxagent/Holder.c deleted 100644 → 0
View file @ cbc9f831
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of the aforementioned persons and companies. */
/* */
/* Redistribution and use of the present software is allowed according */
/* to terms specified in the file LICENSE which comes in the source */
/* distribution. */
/* */
/* All rights reserved. */
/* */
/* NOTE: This software has received contributions from various other */
/* contributors, only the core maintainers and supporters are listed as */
/* copyright holders. Please contact us, if you feel you should be listed */
/* as copyright holder, as well. */
/* */
/**************************************************************************/
#include <signal.h>
#include <stdio.h>
/*
* Set here the required log level.
*/
#define PANIC
#define WARNING
#undef TEST
#undef DEBUG
#undef DUMP
#ifdef DUMP
static char hexdigit(char c)
{
char map[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', '?'};
return map[c];
}
/*
FIXME: Please, check the implementation of the same
function in nxcomp.
*/
char *nxagentChecksum(char *string, int length)
{
static char md5_output[MD5_DIGEST_LENGTH * 2 + 1];
static char md5[MD5_DIGEST_LENGTH];
char * ret;
int i;
memset(md5, 0, sizeof(md5));
memset(md5_output, 0, sizeof(md5_output));
ret = MD5(string, length, md5);
for (i = 0; i < MD5_DIGEST_LENGTH; i++)
{
char c = md5[i];
md5_output[i * 2 + 0] = hexdigit((c >> 0) & 0xF);
md5_output[i * 2 + 1] = hexdigit((c >> 4) & 0xF);
}
return md5_output;
}
#else
const char *nxagentChecksum(char *data, int size)
{
return "";
}
#endif
nx-X11/programs/Xserver/hw/nxagent/Holder.h deleted 100644 → 0
View file @ cbc9f831
/**************************************************************************/
/* */
/* Copyright (c) 2001, 2011 NoMachine (http://www.nomachine.com) */
/* Copyright (c) 2008-2014 Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> */
/* Copyright (c) 2011-2016 Mike Gabriel <mike.gabriel@das-netzwerkteam.de>*/
/* Copyright (c) 2014-2016 Mihai Moldovan <ionic@ionic.de> */
/* Copyright (c) 2014-2016 Ulrich Sibiller <uli42@gmx.de> */
/* Copyright (c) 2015-2016 Qindel Group (http://www.qindel.com) */
/* */
/* NXAGENT, NX protocol compression and NX extensions to this software */
/* are copyright of the aforementioned persons and companies. */
/* */
/* Redistribution and use of the present software is allowed according */
/* to terms specified in the file LICENSE which comes in the source */
/* distribution. */
/* */
/* All rights reserved. */
/* */
/* NOTE: This software has received contributions from various other */
/* contributors, only the core maintainers and supporters are listed as */
/* copyright holders. Please contact us, if you feel you should be listed */
/* as copyright holder, as well. */
/* */
/**************************************************************************/
#ifndef __Holder_H__
#define __Holder_H__
const char *nxagentChecksum(char *data, int size);
#endif /* __Holder_H__ */
nx-X11/programs/Xserver/hw/nxagent/Imakefile
View file @ dbf36ece
...@@ -52,8 +52,7 @@ SRCS = \ ...@@ -52,8 +52,7 @@ SRCS = \
Clipboard.c \ Clipboard.c \
Splash.c \ Splash.c \
Split.c \ Split.c \
Holder.c \ Reconnect.c \
Reconnect.c \
Error.c \ Error.c \
Atoms.c \ Atoms.c \
Trap.c \ Trap.c \
...@@ -111,7 +110,6 @@ OBJS = \ ...@@ -111,7 +110,6 @@ OBJS = \
Clipboard.o \ Clipboard.o \
Splash.o \ Splash.o \
Split.o \ Split.o \
Holder.o \
Reconnect.o \ Reconnect.o \
Error.o \ Error.o \
Atoms.o \ Atoms.o \
......
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
View file @ dbf36ece
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#include "Visual.h" #include "Visual.h"
#include "Client.h" #include "Client.h"
#include "Events.h" #include "Events.h"
#include "Holder.h"
#include "Args.h" #include "Args.h"
#include "Utils.h" #include "Utils.h"
......
nx-X11/programs/Xserver/hw/nxagent/Screen.c
View file @ dbf36ece
...@@ -76,7 +76,6 @@ is" without express or implied warranty. ...@@ -76,7 +76,6 @@ is" without express or implied warranty.
#include "Client.h" #include "Client.h"
#include "Options.h" #include "Options.h"
#include "Splash.h" #include "Splash.h"
#include "Holder.h"
#include "Render.h" #include "Render.h"
#include "Trap.h" #include "Trap.h"
#include "Keyboard.h" #include "Keyboard.h"
......
nx-X11/programs/Xserver/hw/nxagent/Utils.h
View file @ dbf36ece
...@@ -44,6 +44,17 @@ static inline const char * validateString(const char *str) { ...@@ -44,6 +44,17 @@ static inline const char * validateString(const char *str) {
return str ? str : "(null)"; return str ? str : "(null)";
} }
/*
* nxagentChecksum used to be in Holder.c but was broken beyond
* repair. As Holder.c was removed we put it here as a stub until we
* need it for debugging.
*/
static inline const char *nxagentChecksum(char *data, int size)
{
return "not_implemented";
}
#define SAFE_XFree(what) do {if (what) {XFree(what); what = NULL;}} while (0) #define SAFE_XFree(what) do {if (what) {XFree(what); what = NULL;}} while (0)
#define SAFE_free(what) do {free(what); what = NULL;} while (0) #define SAFE_free(what) do {free(what); what = NULL;} while (0)
......
nx-X11/programs/Xserver/hw/nxagent/Window.c
View file @ dbf36ece
...@@ -59,7 +59,6 @@ ...@@ -59,7 +59,6 @@
#include "Reconnect.h" #include "Reconnect.h"
#include "Dialog.h" #include "Dialog.h"
#include "Splash.h" #include "Splash.h"
#include "Holder.h"
#include "Init.h" #include "Init.h"
#include "Composite.h" #include "Composite.h"
#include "Events.h" #include "Events.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment