Changeset 24254

Timestamp:

10/13/13 01:18:52 (9 years ago)

Author:

obi

Message:

fix merge

Location:

titan/plugins/tithek

Files:

• flashx.h (modified) (5 diffs)
• zdf.h (modified) (2 diffs)

titan/plugins/tithek/flashx.h

@@ -4 +4 @@
 char* flashx(char* host, char* file, char* hosterurl)
 {
-        debug(99, "host: %s file: %s", host, file);
+        debug(99, "host: %s", host);
+        debug(99, "file: %s", file);
         debug(99, "hosterurl: %s", hosterurl);
+        int debuglevel = getconfigint("debuglevel", NULL);
         char* tmphost = NULL;
         char* tmppath = NULL;
@@ -40 +42 @@
         debug(99, "send: %s", send);
         tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
-        if(getconfigint("debuglevel", NULL) == 99)
-                writesys("/tmp/flashx_tmpstr_get1", tmpstr, 0);
+        titheklog(debuglevel, "/tmp/flashx_tmpstr_get1", NULL, tmpstr);
 //      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get1", tmpstr, 0);
 //printf("\n#######################################################\n");
@@ -82 +83 @@
         tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
 
-        if(getconfigint("debuglevel", NULL) == 99)
-                writesys("/tmp/flashx_tmpstr_get2", tmpstr, 0);
+        titheklog(debuglevel, "/tmp/flashx_tmpstr_get2", NULL, tmpstr);
 //      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get2", tmpstr, 0);
 //printf("\n#######################################################\n");
@@ -126 +126 @@
         tmpstr = gethttpreal(tmphost, "/player/show.php", 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
 
-        if(getconfigint("debuglevel", NULL) == 99)
-                writesys("/tmp/flashx_tmpstr_get3", tmpstr, 0);
+        titheklog(debuglevel, "/tmp/flashx_tmpstr_get3", NULL, tmpstr);
 //      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get3", tmpstr, 0);
 //printf("\n#######################################################\n");
@@ -161 +160 @@
         tmpstr = gethttpreal(tmphost, tmppath, 80, NULL, NULL, NULL, 0, send, NULL, 5000, 1);
 
-        if(getconfigint("debuglevel", NULL) == 99)
-                writesys("/tmp/flashx_tmpstr_get4", tmpstr, 0);
+        titheklog(debuglevel, "/tmp/flashx_tmpstr_get4", NULL, tmpstr);
 //      writesys("/var/usr/local/share/titan/plugins/tithek//flashx_tmpstr_get4", tmpstr, 0);
 //printf("\n#######################################################\n");

titan/plugins/tithek/zdf.h

@@ -37 +37 @@
                 tmpstr2 = string_replace_all("<formitaet basetype", "\n\t<formitaet basetype", tmpstr2, 1);
 
-                titheklog(debuglevel, "/tmp/zdf1_tmpstr2", NULL, tmpstr");
+                titheklog(debuglevel, "/tmp/zdf1_tmpstr2", NULL, tmpstr);
                 
                 int count = 0, i = 0;   
@@ -126 +126 @@
         free(ip), ip = NULL;
 
-        titheklog(debuglevel, "/tmp/zdf2_streamurl", NULL, streamurl");
+        titheklog(debuglevel, "/tmp/zdf2_streamurl", NULL, streamurl);
 
 // segfault munmap_chunk(): invalid pointer