From dbf36ece31793840a16467fcac1245dfa6b587ab Mon Sep 17 00:00:00 2001
From: Ulrich Sibiller <uli42@gmx.de>
Date: Wed, 23 Oct 2019 21:20:39 +0200
Subject: nxagent: drop Holder.[ch]
The only left code was nxagentCheckum() which was not compiling anyway.
---
nx-X11/programs/Xserver/hw/nxagent/GCOps.c | 1 -
nx-X11/programs/Xserver/hw/nxagent/Holder.c | 82 ----------------------------
nx-X11/programs/Xserver/hw/nxagent/Holder.h | 31 -----------
nx-X11/programs/Xserver/hw/nxagent/Imakefile | 4 +-
nx-X11/programs/Xserver/hw/nxagent/Pixmap.c | 1 -
nx-X11/programs/Xserver/hw/nxagent/Screen.c | 1 -
nx-X11/programs/Xserver/hw/nxagent/Utils.h | 11 ++++
nx-X11/programs/Xserver/hw/nxagent/Window.c | 1 -
8 files changed, 12 insertions(+), 120 deletions(-)
delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/Holder.c
delete mode 100644 nx-X11/programs/Xserver/hw/nxagent/Holder.h
diff --git a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
index 6ab46c424..7db1aff58 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/GCOps.c
@@ -54,7 +54,6 @@ is" without express or implied warranty.
#include "Events.h"
#include "Client.h"
#include "Trap.h"
-#include "Holder.h"
#include "Args.h"
#include "Screen.h"
#include "Utils.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.c b/nx-X11/programs/Xserver/hw/nxagent/Holder.c
deleted file mode 100644
index dd2756c92..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/Holder.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/**************************************************************************/
-/* */
-/* 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
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Holder.h b/nx-X11/programs/Xserver/hw/nxagent/Holder.h
deleted file mode 100644
index 312156aee..000000000
--- a/nx-X11/programs/Xserver/hw/nxagent/Holder.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************/
-/* */
-/* 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__ */
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
index c300e41db..58fb43403 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile
+++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile
@@ -52,8 +52,7 @@ SRCS = \
Clipboard.c \
Splash.c \
Split.c \
- Holder.c \
- Reconnect.c \
+ Reconnect.c \
Error.c \
Atoms.c \
Trap.c \
@@ -111,7 +110,6 @@ OBJS = \
Clipboard.o \
Splash.o \
Split.o \
- Holder.o \
Reconnect.o \
Error.o \
Atoms.o \
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
index 7a0fcd535..f8241d4d7 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Pixmap.c
@@ -47,7 +47,6 @@
#include "Visual.h"
#include "Client.h"
#include "Events.h"
-#include "Holder.h"
#include "Args.h"
#include "Utils.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 26fd701a3..d7b7fe095 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -76,7 +76,6 @@ is" without express or implied warranty.
#include "Client.h"
#include "Options.h"
#include "Splash.h"
-#include "Holder.h"
#include "Render.h"
#include "Trap.h"
#include "Keyboard.h"
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Utils.h b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
index e61a79144..c578549dc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Utils.h
+++ b/nx-X11/programs/Xserver/hw/nxagent/Utils.h
@@ -44,6 +44,17 @@ static inline const char * validateString(const char *str) {
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_free(what) do {free(what); what = NULL;} while (0)
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c
index fadf6ffb1..88110e7dc 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Window.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c
@@ -59,7 +59,6 @@
#include "Reconnect.h"
#include "Dialog.h"
#include "Splash.h"
-#include "Holder.h"
#include "Init.h"
#include "Composite.h"
#include "Events.h"
--
cgit v1.2.3