From f7c8f582eae55c9d94cef0eaee04b08699ad1645 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 21 May 2021 12:43:18 +0200
Subject: [PATCH] The macro DEPRECATED_VDR_CHARSET_OVERRIDE and the related
 code has been removed

---
 HISTORY |  1 +
 vdr.c   | 13 +------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/HISTORY b/HISTORY
index fe42743c..dafa4679 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9693,3 +9693,4 @@ Video Disk Recorder Revision History
 - Added code for the 'qad' audio track (thanks to Helmut Binder).
 - The 'Edit path' dialog now also shows the total size of all recordings in that path
   (thanks to Christoph Haubrich).
+- The macro DEPRECATED_VDR_CHARSET_OVERRIDE and the related code has been removed.
diff --git a/vdr.c b/vdr.c
index 7b5cc2f5..d723addd 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 5.5 2021/04/20 13:22:37 kls Exp $
+ * $Id: vdr.c 5.6 2021/05/21 12:43:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -237,13 +237,6 @@ int main(int argc, char *argv[])
   int WatchdogTimeout = DEFAULTWATCHDOG;
   const char *Terminal = NULL;
   const char *OverrideCharacterTable = NULL;
-#ifndef DEPRECATED_VDR_CHARSET_OVERRIDE
-#define DEPRECATED_VDR_CHARSET_OVERRIDE 0
-#endif
-#if DEPRECATED_VDR_CHARSET_OVERRIDE
-  OverrideCharacterTable = getenv("VDR_CHARSET_OVERRIDE");
-  const char *DeprecatedVdrCharsetOverride = OverrideCharacterTable;
-#endif
 
   bool UseKbd = true;
   const char *LircDevice = NULL;
@@ -722,10 +715,6 @@ int main(int argc, char *argv[])
      isyslog("codeset is '%s' - %s", CodeSet, known ? "known" : "unknown");
      cCharSetConv::SetSystemCharacterTable(CodeSet);
      }
-#if DEPRECATED_VDR_CHARSET_OVERRIDE
-  if (DeprecatedVdrCharsetOverride)
-     isyslog("use of environment variable VDR_CHARSET_OVERRIDE (%s) is deprecated!", DeprecatedVdrCharsetOverride);
-#endif
   if (OverrideCharacterTable) {
      bool known = SI::SetOverrideCharacterTable(OverrideCharacterTable);
      isyslog("override character table is '%s' - %s", OverrideCharacterTable, known ? "known" : "unknown");