Changeset 1195

Timestamp:

01/12/10 19:39:07 (13 years ago)

Author:

alno

Message:

WebIf:

• fix compilerwarnings (Ticket #348)
• whitespace

Location:

branches/monitor-improvement

Files:

• module-monitor.c (modified) (1 diff)
• oscam-config.c (modified) (2 diffs)
• oscam-http.c (modified) (2 diffs)

branches/monitor-improvement/module-monitor.c

@@ -619 +619 @@
 static int monitor_process_request(char *req)
 {
-  int i, rc;
-  char *cmd[]={"login", "exit", "log", "status", "shutdown", "reload", "details", "version", "debug", "setuser", "setserver"};
-  char *arg;
-  if( (arg=strchr(req, ' ')) )
-  {
-    *arg++=0;
-    trim(arg);
-  }
-  trim(req);
-  if ((!auth) && (strcmp(req, cmd[0])))
-    monitor_login(NULL);
-  for (rc=1, i=0; i<11; i++)
-    if (!strcmp(req, cmd[i]))
-    {
-      switch(i)
-      {
-        case  0:  monitor_login(arg);
-                    break;                              // login
-        case  1:  rc=0;
-                    break;                              // exit
-        case  2:  monitor_logsend(arg);
-                    break;                              // log
-        case  3:  monitor_process_info();
-                    break;                              // status
-        case  4:  if (client[cs_idx].monlvl>3)
-                    kill(client[0].pid, SIGQUIT);       // shutdown
-                      break;
-        case  5:  if (client[cs_idx].monlvl>2)
-                    kill(client[0].pid, SIGHUP);        // reload
-                      break;
-        case  6:  monitor_process_details(arg);
-                    break;                              // details
-        case  7:  monitor_send_details_version();
-                    break;                              // version
-        case  8:  if (client[cs_idx].monlvl>3)
-                    monitor_set_debuglevel(arg);        // debuglevel
-                      break;
-        case  9:  if (client[cs_idx].monlvl>3)
-                    monitor_set_account(arg);           // setuser
-                      break;
-        case  10: if (client[cs_idx].monlvl>3)
-                    monitor_set_server(arg);            // setserver
-                      break;
-
-        default: continue;
-      }
-      break;
-    }
-  return(rc);
+    int i, rc;
+    char *cmd[] = {"login", "exit", "log", "status", "shutdown", "reload", "details", "version", "debug", "setuser", "setserver"};
+    int cmdcnt = sizeof(cmd)/sizeof(char *);  // Calculate the amount of items in array
+    char *arg;
+
+    if( (arg = strchr(req, ' ')) ) { *arg++ = 0; trim(arg); }
+    //trim(req);
+    if ((!auth) && (strcmp(req, cmd[0])))   monitor_login(NULL);
+
+    for (rc=1, i = 0; i < cmdcnt; i++)
+        if (!strcmp(req, cmd[i])) {
+            switch(i) {
+                case  0:    monitor_login(arg); break;  // login
+                case  1:    rc=0; break;    // exit
+                case  2:    monitor_logsend(arg); break;    // log
+                case  3:    monitor_process_info(); break;  // status
+                case  4:    if (client[cs_idx].monlvl > 3) kill(client[0].pid, SIGQUIT); break; // shutdown
+                case  5:    if (client[cs_idx].monlvl > 2) kill(client[0].pid, SIGHUP); break;  // reload
+                case  6:    monitor_process_details(arg); break;    // details
+                case  7:    monitor_send_details_version(); break;  // version
+                case  8:    if (client[cs_idx].monlvl > 3) monitor_set_debuglevel(arg); break;  // debuglevel
+                case  9:    if (client[cs_idx].monlvl > 3) monitor_set_account(arg); break; // setuser
+                case 10:    if (client[cs_idx].monlvl > 3) monitor_set_server(arg); break;  // setserver
+                default:    continue;
+            }
+            break;
+        }
+    return(rc);
 }
 

branches/monitor-improvement/oscam-config.c

@@ -571 +571 @@
     if (!strcmp(token, "priority")) { strncpy(cfg->dvbapi_priority, value, sizeof(cfg->dvbapi_priority)-1); return; }
     if (!strcmp(token, "ignore"))   { strncpy(cfg->dvbapi_ignore, value, sizeof(cfg->dvbapi_ignore)-1); return; }
-    
+
     if (token[0] != '#')
         fprintf(stderr, "Warning: keyword '%s' in dvbapi section not recognized\n",token);
@@ -1155 +1155 @@
 
         //group
-        char *value = mk_t_group((long*)account->grp);
+        char *value = mk_t_group((ulong*)account->grp);
         fprintf_conf(f, CONFVARWIDTH, "group", "%s\n", value);
         free(value);

branches/monitor-improvement/oscam-http.c

@@ -511 +511 @@
 
     //group
-    char *value = mk_t_group((long*)reader[ridx].grp);
+    char *value = mk_t_group((ulong*)reader[ridx].grp);
     tpl_printf(vars, 0, "GRP", "%s", value);
     free(value);
@@ -742 +742 @@
 
     //Group
-    char *value = mk_t_group((long*)account->grp);
+    char *value = mk_t_group((ulong*)account->grp);
     tpl_addVar(vars, 0, "GROUPS", value);
     free(value);