Browse Source

Move camd proto initialization in data_init().

Georgi Chorbadzhiyski 12 years ago
parent
commit
2df41d7e15
2 changed files with 3 additions and 2 deletions
  1. 3
    0
      data.c
  2. 0
    2
      tsdecrypt.c

+ 3
- 0
data.c View File

@@ -20,6 +20,7 @@
20 20
 #include <string.h>
21 21
 
22 22
 #include "data.h"
23
+#include "camd.h"
23 24
 
24 25
 void data_init(struct ts *ts) {
25 26
 	memset(ts, 0, sizeof(struct ts));
@@ -67,6 +68,8 @@ void data_init(struct ts *ts) {
67 68
 	strcpy(ts->camd.user, "user");
68 69
 	strcpy(ts->camd.pass, "pass");
69 70
 
71
+	camd_proto_cs378x(&ts->camd.ops);
72
+
70 73
 	// Config
71 74
 	ts->syslog_port = 514;
72 75
 

+ 0
- 2
tsdecrypt.c View File

@@ -628,8 +628,6 @@ int main(int argc, char **argv) {
628 628
 
629 629
 	parse_options(&ts, argc, argv);
630 630
 
631
-	camd_proto_cs378x(&ts.camd.ops);
632
-
633 631
 	if (ts.pidfile[0])
634 632
 		daemonize(ts.pidfile);
635 633
 

Loading…
Cancel
Save