Changeset 4162

Timestamp:

12/19/10 20:12:14 (12 years ago)

Author:

alno

Message:

Remove legacy debuglevel switch code which was required in forked oscam

Location:

trunk

Files:

• globals.h (modified) (1 diff)
• module-monitor.c (modified) (1 diff)
• oscam.c (modified) (2 diffs)

trunk/globals.h

@@ -1018 +1018 @@
 {
     int     nice;
-    int     debuglvl;
     ulong       netprio;
     ulong       ctimeout;

trunk/module-monitor.c

@@ -331 +331 @@
     sprintf(buf, "System=%s-%s-%s",  CS_OS_CPU, CS_OS_HW, CS_OS_SYS);
     monitor_send_details(buf, pid);
-    sprintf(buf, "DebugLevel=%d", cfg->debuglvl);
+    sprintf(buf, "DebugLevel=%d", cs_dblevel);
     monitor_send_details(buf, pid);
     sprintf(buf, "MaxClients=UNLIMITED");

trunk/oscam.c

@@ -632 +632 @@
 {
     //switch debuglevel forward one step if not set from outside
-    if(cfg->debuglvl == cs_dblevel) {
-        switch (cs_dblevel) {
-            case 0:
-                cs_dblevel = 1;
-                break;
-            case 128:
-                cs_dblevel = 255;
-                break;
-            case 255:
-                cs_dblevel = 0;
-                break;
-            default:
-                cs_dblevel <<= 1;
-        }
-    } else {
-        cs_dblevel = cfg->debuglvl;
-    }
-
-    cfg->debuglvl = cs_dblevel;
+    switch (cs_dblevel) {
+        case 0:
+            cs_dblevel = 1;
+            break;
+        case 128:
+            cs_dblevel = 255;
+            break;
+        case 255:
+            cs_dblevel = 0;
+            break;
+        default:
+            cs_dblevel <<= 1;
+    }
+
     cs_log("%sdebug_level=%d", "all", cs_dblevel);
 }
@@ -3175 +3170 @@
   init_config();
   init_stat();
-  cfg->debuglvl = cs_dblevel; // give static debuglevel to outer world
+
   for (i=0; mod_def[i]; i++)  // must be later BEFORE init_config()
   {