readjust some parts for vdr < 2.3.1

Author: flensrocker

channel.c

@@ -99,12 +99,11 @@ namespace cDBusChannelsHelper
 
     GVariantBuilder *array = g_variant_builder_new(G_VARIANT_TYPE("a(is)"));
 
-    const cChannels *channels = NULL;
 #if VDRVERSNUM > 20300
     LOCK_CHANNELS_READ;
-    channels = Channels;
+    const cChannels *channels = Channels;
 #else
-    channels = &Channels;
+    cChannels *channels = &Channels;
 #endif
     if ((option != NULL) && *option && !withGroupSeps) {
        if (isnumber(option)) {

epg.c

@@ -111,12 +111,11 @@ namespace cDBusEpgHelper
        tChannelID ChannelID = tChannelID::InvalidID;
        if (isnumber(channel)) {
           int o = strtol(channel, NULL, 10);
-          const cChannels *channels = NULL;
 #if VDRVERSNUM > 20300
           LOCK_CHANNELS_READ;
-          channels = Channels;
+          const cChannels *channels = Channels;
 #else
-          channels = &Channels;
+          cChannels *channels = &Channels;
 #endif
           if (o >= 1 && o <= channels->MaxNumber())
              ChannelID = channels->GetByNumber(o)->GetChannelID();
@@ -319,7 +318,11 @@ namespace cDBusEpgHelper
     g_variant_builder_unref(arr);
   }
 
+#if VDRVERSNUM > 20300
   static bool sGetChannel(GVariant *Arg, const char **Input, const cChannels* Channels, const cChannel **Channel)
+#else
+  static bool sGetChannel(GVariant *Arg, const char **Input, cChannels* Channels, const cChannel **Channel)
+#endif
   {
     *Channel = NULL;
     *Input = NULL;
@@ -354,12 +357,11 @@ namespace cDBusEpgHelper
 
   static void sGetEntries(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation, eMode mode)
   {
-    const cChannels *channels = NULL;
 #if VDRVERSNUM > 20300
     LOCK_CHANNELS_READ;
-    channels = Channels;
+    const cChannels *channels = Channels;
 #else
-    channels = &Channels;
+    cChannels *channels = &Channels;
 #endif
     const cChannel *channel = NULL;
     guint64 atTime = 0;

recording.c

@@ -134,16 +134,15 @@ class cDBusRecordingsHelper
 
   static void Get(cDBusObject *Object, GVariant *Parameters, GDBusMethodInvocation *Invocation)
   {
-    const cRecordings *recs = NULL;
 #if VDRVERSNUM > 20300
     LOCK_RECORDINGS_READ;
-    recs = Recordings;
+    const cRecordings *recs = Recordings;
 #else
     // only update recordings list if empty
     // so we don't mess around with the index values returned by List
     if (recordings.Count() == 0)
        recordings.Update(true);
-    recs = &recordings;
+    cRecordings *recs = &recordings;
 #endif
 
     const cRecording *recording = NULL;
@@ -211,13 +210,12 @@ class cDBusRecordingsHelper
     int position = -1; // default: resume
     const char *hmsf = NULL;
 
-    const cRecordings *recs = NULL;
 #if VDRVERSNUM > 20300
     LOCK_RECORDINGS_READ;
-    recs = Recordings;
+    const cRecordings *recs = Recordings;
 #else
     recordings.Update(true);
-    recs = &recordings;
+    cRecordings *recs = &recordings;
 #endif
 
     GVariant *first = g_variant_get_child_value(Parameters, 0);

remote.c

@@ -274,12 +274,11 @@ namespace cDBusRemoteHelper
     char *option = NULL;
     g_variant_get(Parameters, "(&s)", &option);
     const cChannel *channel = NULL;
-    const cChannels *channels = NULL;
 #if VDRVERSNUM > 20300
     LOCK_CHANNELS_READ;
-    channels = Channels;
+    const cChannels *channels = Channels;
 #else
-    channels = &Channels;
+    cChannels *channels = &Channels;
 #endif
     if ((option != NULL) && (option[0] != 0)) {
        int n = -1;

shutdown.c

@@ -49,12 +49,11 @@ class cDBusShutdownHelper
        }
 
     time_t Now = time(NULL);
-    const cTimers *timers = NULL;
 #if VDRVERSNUM > 20300
     LOCK_TIMERS_READ;
-    timers = Timers;
+    const cTimers *timers = Timers;
 #else
-    timers = &Timers;
+    cTimers *timers = &Timers;
 #endif
     const cTimer *timer = timers->GetNextActiveTimer();
     time_t Next = timer ? timer->StartTime() : 0;
@@ -199,12 +198,11 @@ class cDBusShutdownHelper
     cString info = "";
 
     time_t Now = time(NULL);
-    const cTimers *timers = NULL;
 #if VDRVERSNUM > 20300
     LOCK_TIMERS_READ;
-    timers = Timers;
+    const cTimers *timers = Timers;
 #else
-    timers = &Timers;
+    cTimers *timers = &Timers;
 #endif
     const cTimer *timer = timers->GetNextActiveTimer();
     time_t Next = timer ? timer->StartTime() : 0;

timer.c

@@ -160,12 +160,11 @@ namespace cDBusTimersHelper
     time_t start = 0;
     time_t stop = 0;
     const char *title = "";
-    const cTimers *timers = NULL;
 #if VDRVERSNUM > 20300
     LOCK_TIMERS_READ;
-    timers = Timers;
+    const cTimers *timers = Timers;
 #else
-    timers = &Timers;
+    cTimers *timers = &Timers;
 #endif
     const cTimer *t = timers->GetNextActiveTimer();
     const cEvent *e;