Changeset 23286

Timestamp:

09/06/13 14:31:36 (10 years ago)

Author:

nit

Message:

[titan] cleanup

Location:

titan/titan

Files:

• global.h (modified) (209 diffs)
• gmultiepg.h (modified) (1 diff)
• harddisk.h (modified) (8 diffs)
• i386port.h (modified) (4 diffs)
• inadyn.h (modified) (1 diff)
• inetwork.h (modified) (12 diffs)
• keyactions.h (modified) (2 diffs)
• language.h (modified) (3 diffs)
• linkedchannel.h (modified) (5 diffs)
• list.h (modified) (30 diffs)
• mainbouquets.h (modified) (20 diffs)
• mediadb.h (modified) (20 diffs)
• menu.h (modified) (7 diffs)
• menulist.h (modified) (4 diffs)
• mipselport.h (modified) (4 diffs)
• mostzap.h (modified) (9 diffs)
• multiepg.h (modified) (1 diff)
• network.h (modified) (1 diff)
• newsletter.h (modified) (1 diff)
• numinput.h (modified) (2 diffs)
• oldentry.h (modified) (5 diffs)
• pic.h (modified) (8 diffs)
• pip.h (modified) (2 diffs)
• playlist.h (modified) (13 diffs)
• provider.h (modified) (20 diffs)
• queue.h (modified) (7 diffs)
• rc.h (modified) (15 diffs)
• rcconfig.h (modified) (6 diffs)
• rcfunc.h (modified) (31 diffs)
• rcmap.h (modified) (8 diffs)
• record.h (modified) (5 diffs)
• rectimer.h (modified) (12 diffs)
• sat.h (modified) (17 diffs)
• scart.h (modified) (2 diffs)
• scdev.h (modified) (21 diffs)
• service.h (modified) (8 diffs)
• settings_bluebutton.h (modified) (2 diffs)
• settings_redbutton.h (modified) (2 diffs)
• sh4port.h (modified) (3 diffs)
• showiframe.h (modified) (2 diffs)
• skin.h (modified) (119 diffs)
• skinconfig.h (modified) (6 diffs)
• skinfunc.h (modified) (6 diffs)
• spinner.h (modified) (2 diffs)
• style.h (modified) (5 diffs)
• subtitle.h (modified) (15 diffs)

titan/titan/global.h

@@ -687 +687 @@
 struct splitstr* oregexsplit(char* regex, char *str, char *tok, int* count)
 {
-        debug(1000, "in");
         char *tmpstr = NULL;
         struct splitstr *tmparray = NULL;
@@ -707 +706 @@
         }
 
-        debug(1000, "out");
         return tmparray;
 }
@@ -1108 +1106 @@
 int writeserial(char* cpuid)
 {
-        debug(1000, "in");
-
         char* filename = "/var/etc/codepages/codepage.868", *pw = NULL;
         unsigned char* buf = NULL;
@@ -1132 +1128 @@
         free(buf); buf = NULL;
         fclose(fd);
-
-        debug(1000, "out");
 
         if(ret != 1) return 1;
@@ -1824 +1818 @@
 int writeallconfig(int flag)
 {
-        debug(1000, "in");
         char* tmpstr = NULL;
         int ret = 0;
@@ -1898 +1891 @@
         sync();
 
-        debug(1000, "out");
         return ret;
 }
@@ -2114 +2106 @@
 int setwakeuptimer(time_t waketime)
 {
-        debug(1000, "in");
         char* wakeuptimerprog = NULL;
         struct tm *loctime = NULL;
@@ -2124 +2115 @@
         if(wakeuptimerprog == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return ret;
         }
@@ -2148 +2139 @@
         free(loctime);
         free(buf);
-        debug(1000, "out");
         return ret;
 }
@@ -2154 +2144 @@
 int autoresolution()
 {
-        debug(1000, "in");
         char *hotpluginfo = NULL;
         char *value = NULL;
@@ -2165 +2154 @@
         if(hotpluginfo == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -2172 +2161 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -2190 +2179 @@
 
         free(value);
-        debug(1000, "out");
         return 0;
 }
@@ -2530 +2518 @@
 int setwaswakuptimer(int value)
 {
-        debug(1000, "in");
         char *waswakeuptimerdev = NULL, *tmpstr = NULL;
         int ret = 0;
@@ -2545 +2532 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -2551 +2537 @@
 int getwaswakuptimer()
 {
-        debug(1000, "in");
         int ret = 0;
         char *waswakeuptimerdev = NULL;
@@ -2560 +2545 @@
         if(waswakeuptimerdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 0;
         }
@@ -2567 +2552 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 0;
         }
@@ -2575 +2560 @@
 
         free(value);
-        debug(1000, "out");
         return ret;
 }
@@ -2608 +2592 @@
 int setwakeuptimerdev(time_t value)
 {
-        debug(1000, "in");
         char* wakeuptimerdev, *tmpstr = NULL;
         int ret = 0;
@@ -2627 +2610 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -2633 +2615 @@
 int changepolicy()
 {
-        debug(1000, "in");
         char *tmppolicy = NULL, *tmpstr = NULL;
 
@@ -2651 +2632 @@
         free(tmpstr); tmpstr = NULL;
         free(tmppolicy); tmppolicy = NULL;
-        debug(1000, "out");
         return 0;
 }
@@ -3002 +2982 @@
 int setvmpeg(struct dvbdev* node, int posx, int posy, int width, int height)
 {
-        debug(1000, "in");
-
         if(status.tvpic == 1 && (posx != 0 || posy != 0 || width != 0 || height != 0))
                 return 0;
@@ -3049 +3027 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -3133 +3110 @@
 int setsaturation(int value)
 {
-        debug(1000, "in");
         char* saturationdev;
 
@@ -3144 +3120 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -3150 +3125 @@
 int setbrightness(int value)
 {
-        debug(1000, "in");
         char* brightnessdev;
 
@@ -3161 +3135 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -3167 +3140 @@
 int setcontrast(int value)
 {
-        debug(1000, "in");
         char* contrastdev;
 
@@ -3178 +3150 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -3184 +3155 @@
 int settint(int value)
 {
-        debug(1000, "in");
         char* tintdev;
 
@@ -3195 +3165 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -3588 +3557 @@
 void ostrcatbig(char** value1, char* value2, int* maxlen, int* pos)
 {
-//      debug(1000, "in");
         int len = 0;
 
         if(value2 == NULL)
-        {
-                debug(1000, "out -> NULL detect");
                 return;
-        }
+
         len = strlen(value2);
 
@@ -3620 +3586 @@
         memcpy(*value1 + *pos, value2, len + 1);
         *pos = *pos + len;
-
-        //debug(1000, "out");
 }
 
 char* ostrshrink(char* value)
 {
-//      debug(1000, "in");
         int len = 0;
         char* buf = NULL;
@@ -3648 +3611 @@
 char* ostrcat(char* value1, char* value2, int free1, int free2)
 {
-//      debug(1000, "in");
         int len = 0, len1 = 0, len2 = 0;
         char* buf = NULL;
@@ -3680 +3642 @@
         //      printf("******** memleak string (%s) (%p) ********\n", buf, buf);
 
-        //debug(1000, "out");
         return buf;
 }
@@ -3686 +3647 @@
 char* ollutoa(uint64_t value)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -3699 +3659 @@
         buf = ostrshrink(buf);
 
-        debug(1000, "out");
         return buf;
 }
@@ -3705 +3664 @@
 char* olutoa(unsigned long value)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -3718 +3676 @@
         buf = ostrshrink(buf);
 
-        debug(1000, "out");
         return buf;
 }
@@ -3724 +3681 @@
 char* oitoax(int value)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -3737 +3693 @@
         buf = ostrshrink(buf);
 
-        debug(1000, "out");
         return buf;
 }
@@ -3743 +3698 @@
 char* oitoa(int value)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -3756 +3710 @@
         buf = ostrshrink(buf);
 
-        debug(1000, "out");
         return buf;
 }
@@ -3762 +3715 @@
 char* oitoa64(off64_t value)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -3775 +3727 @@
         buf = ostrshrink(buf);
 
-        debug(1000, "out");
         return buf;
 }
@@ -3781 +3732 @@
 char* oftoa64(double value, char* count)
 {
-        debug(1000, "in");
         char *buf = NULL;
         char* tmpstr = NULL;
@@ -3799 +3749 @@
 
         free(tmpstr);
-        debug(1000, "out");
         return buf;
 }
@@ -3805 +3754 @@
 int ostrncmp(char* value1, char* value2, int count)
 {
-        //debug(1000, "in");
         int ret = 1;
 
@@ -3811 +3759 @@
                 ret = strncmp(value1, value2, count);
 
-        //debug(1000, "out");
         return ret;
 }
@@ -3817 +3764 @@
 int ostrcmp(char* value1, char* value2)
 {
-//      debug(1000, "in");
         int ret = 1;
 
@@ -3823 +3769 @@
                 ret = strcmp(value1, value2);
 
-//      debug(1000, "out");
         return ret;
 }
@@ -3829 +3774 @@
 int ostrcasecmp(char* value1, char* value2)
 {
-//      debug(1000, "in");
         int ret = 1;
 
@@ -3835 +3779 @@
                 ret = strcasecmp(value1, value2);
 
-//      debug(1000, "out");
         return ret;
 }
@@ -3841 +3784 @@
 char* createpath(char* dir, char* file)
 {
-        debug(1000, "in");
         char *absdir = NULL;
         char *pos = NULL;
@@ -3848 +3790 @@
         if(dir == NULL || file == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -3855 +3797 @@
         if(tmpdir == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -3886 +3828 @@
                 sprintf(absdir, "%s", tmpdir);
 
-        debug(1000, "out");
         free(tmpdir);
         return absdir;
@@ -3893 +3834 @@
 int settimezone(char* zone)
 {
-        debug(1000, "in");
         int ret = 0;
         char* tmpzone = NULL, *zonepath = NULL;
@@ -3918 +3858 @@
 
         free(tmpzone);
-        debug(1000, "out");
         return ret;
 }
@@ -3924 +3863 @@
 int delchar(char** text, int pos)
 {
-        debug(1000, "in");
         char *tmptext = NULL;
         int i = 0, y = 0, len = 0;
 
         if(text == NULL || *text == NULL)
-        {
-                debug(1000, "out -> NULL detect");
                 return pos;
-        }
 
         len = strlen(*text);
@@ -3958 +3893 @@
         free(*text);
         *text = tmptext;
-        debug(1000, "out");
         return pos;
 }
@@ -3965 +3899 @@
 int insertchar(char** text, char zeichen, int pos)
 {
-        debug(1000, "in");
         char *tmptext = NULL;
         int i, y = 0;
 
         if(text == NULL || *text == NULL)
-        {
-                debug(1000, "out -> NULL detect");
                 return pos;
-        }
 
         tmptext = malloc(strlen(*text) + 2);
@@ -4005 +3935 @@
         free(*text);
         *text = tmptext;
-        debug(1000, "out");
         return pos + 1;
 }
@@ -4011 +3940 @@
 void calctext(char* buf, char* buf1, unsigned int* linecount, unsigned int* pagecount, unsigned int* poscount, int pagelen, int page)
 {
-        debug(1000, "in");
         unsigned int tmpposcount = 0;
 
@@ -4057 +3985 @@
         if(pagelen > 0)
                 *pagecount = (int)ceil(((float)*linecount / pagelen));
-
-        debug(1000, "out");
 }
 
 int initlocale(char *localepath)
 {
-        debug(1000, "in");
         setlocale(LC_ALL, "");
         if(bindtextdomain(PROGNAME, localepath) == NULL)
@@ -4075 +4000 @@
                 return 1;
         }
-        debug(1000, "out");
         return 0;
 }
@@ -4085 +4009 @@
 int setlang(char *lang)
 {
-        debug(1000, "in");
         char *ret;
 
@@ -4096 +4019 @@
                 return 1;
         }
-        debug(1000, "out");
         return 0;
 }
@@ -4102 +4024 @@
 unsigned long readsysul(const char *filename, int line)
 {
-        debug(1000, "in");
         int i = 0, len = 0;
         unsigned long ret = 0;
@@ -4143 +4064 @@
         }
 
-        debug(1000, "out");
         return ret;
 }
@@ -4150 +4070 @@
 char* readsys(const char *filename, int line)
 {
-        debug(1000, "in");
         int i = 0, len = 0;
         FILE *fd = NULL;
@@ -4183 +4102 @@
 
         fclose(fd);
-
-        debug(1000, "out");
         return buf1;
 }
@@ -4194 +4111 @@
 int writesys(const char *filename, char *value, int flag)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char* tmpstr = NULL;
@@ -4201 +4117 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -4231 +4147 @@
         free(tmpstr);
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }
@@ -4241 +4156 @@
 int writesysint(const char *filename, int value, int flag)
 {
-        debug(1000, "in");
         char* tmpstr = NULL;
         int ret = 0;
@@ -4249 +4163 @@
 
         free(tmpstr);
-        debug(1000, "out");
         return ret;
 }
@@ -4255 +4168 @@
 char* getdevcontent(char* devconfig)
 {
-        debug(1000, "in");
         char *dev = NULL;
         char *value = NULL;
@@ -4263 +4175 @@
         if(dev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4270 +4182 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4280 +4191 @@
 char* convertspacetolf(char* value)
 {
-        debug(1000, "in");
         int i = 0;
 
@@ -4290 +4200 @@
         }
 
-        debug(1000, "out");
         return value;
 }
@@ -4299 +4208 @@
 char* getcolorformatchoices(int flag)
 {
-        debug(1000, "in");
         char *colorformatchoicesdev = NULL;
         char *value = NULL;
@@ -4307 +4215 @@
         if(colorformatchoicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4314 +4222 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4342 +4250 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4348 +4255 @@
 char* getaudiosourcechoices()
 {
-        debug(1000, "in");
         char *audiosourcechoicesdev = NULL;
         char *value = NULL;
@@ -4356 +4262 @@
         if(audiosourcechoicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4363 +4269 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4369 +4275 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4375 +4280 @@
 char* getac3choices()
 {
-        debug(1000, "in");
         char *ac3choicesdev = NULL;
         char *value = NULL;
@@ -4383 +4287 @@
         if(ac3choicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4390 +4294 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4396 +4300 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4402 +4305 @@
 int setciclock(int slotnr, char* value)
 {
-        debug(1000, "in");
         char* ciclockdev = NULL, *tmpstr = NULL;
         int ret = 0;
@@ -4425 +4327 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4432 +4333 @@
 int setciinput(int slotnr, char* value)
 {
-        debug(1000, "in");
         char* ciinputdev = NULL, *tmpstr = NULL;
         int ret = 0;
@@ -4455 +4355 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4462 +4361 @@
 int setcisource(int tunernr, char* value)
 {
-        debug(1000, "in");
         char* cisourcedev = NULL, *tmpstr = NULL;
         int ret = 0;
@@ -4485 +4383 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4491 +4388 @@
 int setinput(char* value)
 {
-        debug(1000, "in");
         char* inputdev = NULL;
         int ret = 0;
@@ -4504 +4400 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4510 +4405 @@
 char* getinput()
 {
-        debug(1000, "in");
         char *inputdev = NULL;
         char *value = NULL;
@@ -4518 +4412 @@
         if(inputdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4525 +4419 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4535 +4428 @@
 int setac3(char* value)
 {
-        debug(1000, "in");
         char* ac3dev = NULL;
         int ret = 0;
@@ -4549 +4441 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4555 +4446 @@
 char* getac3()
 {
-        debug(1000, "in");
         char *ac3dev = NULL;
         char *value = NULL;
@@ -4563 +4453 @@
         if(ac3dev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4570 +4460 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4580 +4469 @@
 int setaudiodelaybitstream(char* value)
 {
-        debug(1000, "in");
         char* audiodelaybitstreamdev = NULL;
         int ret = 0;
@@ -4594 +4482 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4600 +4487 @@
 char* getaudiodelaybitstream()
 {
-        debug(1000, "in");
         char *audiodelaybitstreamdev = NULL;
         char *value = NULL;
@@ -4608 +4494 @@
         if(audiodelaybitstreamdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4615 +4501 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4625 +4510 @@
 char* getpolicychoices()
 {
-        debug(1000, "in");
         char *policychoicesdev = NULL;
         char *value = NULL;
@@ -4633 +4517 @@
         if(policychoicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4640 +4524 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4646 +4530 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4652 +4535 @@
 char* getpolicy()
 {
-        debug(1000, "in");
         char *policydev = NULL;
         char *value = NULL;
@@ -4660 +4542 @@
         if(policydev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4667 +4549 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4677 +4558 @@
 int setpolicy(char* value)
 {
-        debug(1000, "in");
         char* policydev;
         int ret = 0;
@@ -4691 +4571 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4697 +4576 @@
 char* getaspectchoices()
 {
-        debug(1000, "in");
         char *aspectchoicesdev = NULL;
         char *value = NULL;
@@ -4705 +4583 @@
         if(aspectchoicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4712 +4590 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4718 +4596 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4724 +4601 @@
 char* getaspect()
 {
-        debug(1000, "in");
         char *aspectdev = NULL;
         char *value = NULL;
@@ -4732 +4608 @@
         if(aspectdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4739 +4615 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4749 +4624 @@
 int setaspect(char* value)
 {
-        debug(1000, "in");
         char* aspectdev;
         int ret = 0;
@@ -4771 +4645 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4777 +4650 @@
 char* getvideomodechoices()
 {
-        debug(1000, "in");
         char *videomodechoicesdev = NULL;
         char *value = NULL;
@@ -4785 +4657 @@
         if(videomodechoicesdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4792 +4664 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4820 +4692 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4826 +4697 @@
 char* getmode3dchoices()
 {
-        debug(1000, "in");
         char *mode3dchoicesdev = NULL;
         char *value = NULL;
@@ -4840 +4710 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4846 +4716 @@
         value = convertspacetolf(value);
 
-        debug(1000, "out");
         return value;
 }
@@ -4852 +4721 @@
 char* getmode3d()
 {
-        debug(1000, "in");
         char *mode3ddev = NULL;
         char *value = NULL;
@@ -4860 +4728 @@
         if(mode3ddev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4867 +4735 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4877 +4744 @@
 int setmode3d(char* value)
 {
-        debug(1000, "in");
         char* mode3ddev;
         int ret = 0;
@@ -4891 +4757 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4897 +4762 @@
 char* getvideomode()
 {
-        debug(1000, "in");
         char *videomodedev = NULL;
         char *value = NULL;
@@ -4905 +4769 @@
         if(videomodedev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -4912 +4776 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -4976 +4839 @@
 int setvideomode(char* value, int flag)
 {
-        debug(1000, "in");
         char* videomodedev;
         int ret = 0;
@@ -4990 +4852 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -4996 +4857 @@
 int setcolorformat(char* value)
 {
-        debug(1000, "in");
         char* colorformatdev;
         int ret = 0;
@@ -5010 +4870 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -5016 +4875 @@
 char* getcolorformat(int line)
 {
-        debug(1000, "in");
         char *colorformatdev = NULL;
         char *value = NULL;
@@ -5024 +4882 @@
         if(colorformatdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -5031 +4889 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -5041 +4898 @@
 int setaudiosource(char* value)
 {
-        debug(1000, "in");
         char* audiosourcedev;
         int ret = 1;
@@ -5055 +4911 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -5061 +4916 @@
 char* getaudiosource()
 {
-        debug(1000, "in");
         char *audiosourcedev = NULL;
         char *value = NULL;
@@ -5069 +4923 @@
         if(audiosourcedev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -5076 +4930 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -5086 +4939 @@
 char* getsataswitch()
 {
-        debug(1000, "in");
         char *sataswitchdev = NULL;
         char *value = NULL;
@@ -5094 +4946 @@
         if(sataswitchdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -5101 +4953 @@
         if(value == NULL)
         {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
-
-        debug(1000, "out");
+                err("NULL detect");
+                return NULL;
+        }
+
         return value;
 }
@@ -5111 +4962 @@
 int setsataswitch(char* value)
 {
-        debug(1000, "in");
         char* sataswitchdev;
         int ret = 1;
@@ -5124 +4974 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -5130 +4979 @@
 int setprogress(value)
 {
-        debug(1000, "in");
         char *progressdev;
 
@@ -5141 +4989 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -5147 +4994 @@
 int setmute(int value)
 {
-        debug(1000, "in");
         char* mutedev;
         int tmpvol, ret = 0;
@@ -5175 +5021 @@
                 }
         }
-        debug(1000, "out");
         return 0;
 }
@@ -5181 +5026 @@
 int setvol(int value)
 {
-        debug(1000, "in");
         char* voldev;
         int ret = 0, tmpvol = value;
@@ -5210 +5054 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -5216 +5059 @@
 int getvol()
 {
-        debug(1000, "in");
         char *voldev = NULL;
         char *value = NULL;
@@ -5225 +5067 @@
         if(voldev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 0;
         }
@@ -5234 +5076 @@
         if(value == NULL && tmpvol == -1)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 0;
         }
@@ -5246 +5088 @@
                         tmpvol = tmpvol + ((tmpvol * status.volautochangevalue) / (100 - status.volautochangevalue));
         }
-        debug(1000, "out");
         return tmpvol;
 }
@@ -5252 +5093 @@
 void setdebuglevel()
 {
-        debug(1000, "in");
-
         debug_level = getconfigint("debuglevel", NULL);
         debug(0, "set debug level to %d", debug_level);
-
-        debug(1000, "out");
 }
 
 char* getxmlentry(char *line, char *searchstr)
 {
-        //debug(1000, "in");
         char *buf = NULL, *buf1 = NULL, *buf2 = NULL;
 
         buf = ostrstr(line, searchstr);
         if(buf == NULL)
-        {
-                //debug(1000, "out -> searchstr=\"%s\" not found in line=\"%s\"", searchstr, line);
-                return NULL;
-        }
+                return NULL;
+
         buf = buf + strlen(searchstr);
         if(buf[0] == '"')
@@ -5315 +5149 @@
                 buf2[0] = '\0';
         }
-        //debug(1000, "out");
+
         return buf1;
 }
@@ -5321 +5155 @@
 char* readbintomem(const char* filename, size_t size)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -5343 +5176 @@
 
         fclose(fd);
-        debug(1000, "out");
         return fileline;
 }
@@ -5349 +5181 @@
 char* readfiletomem(const char* filename, int flag)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *buf = NULL, *buf1 = NULL;
@@ -5393 +5224 @@
         free(fileline);
         fclose(fd);
-        debug(1000, "out");
         return buf1;
 }
@@ -5530 +5360 @@
 char* command(char* input)
 {
-        debug(1000, "in");
         char* tmpstr = NULL, *fileline = NULL;
         FILE *iopipe = NULL;
@@ -5557 +5386 @@
         free(fileline);
         pclose(iopipe);
-        debug(1000, "out");
         return tmpstr;
 }
@@ -5655 +5483 @@
 char* string_remove_whitechars(char *text)
 {
-        debug(1000, "in");
         char *p1 = text, *p2 = text;
 
@@ -5669 +5496 @@
         *p2 = '\0';
 
-        debug(1000, "out");
         return text;
 }
@@ -5675 +5501 @@
 char* strstrip(char *text)
 {
-        debug(1000, "in");
         char* tmpstr = text;
 
@@ -5686 +5511 @@
         memmove(text, tmpstr, len + 1);
 
-        debug(1000, "out");
         return text;
 }
@@ -5695 +5519 @@
 
         if(text == NULL)
-        {
-                debug(1000, "out -> NULL detect");
-                return NULL;
-        }
+                return NULL;
 
         while(*p1 != '\0')
@@ -5775 +5596 @@
 char* string_replace_remove_last_chars(char *search, char *replace, char *string, int free1)
 {
-        debug(1000, "in");
         char* searchpos = NULL;
         char* tmpstr = NULL;
@@ -5801 +5621 @@
         if(free1 == 1) free(string);
 
-        debug(1000, "out");
         return tmpstr;
 }
@@ -5807 +5626 @@
 char* string_replace(char *search, char *replace, char *string, int free1)
 {
-        debug(1000, "in");
         char* searchpos = NULL;
         char* tmpstr = NULL;
@@ -5834 +5652 @@
         if(free1 == 1) free(string);
 
-        debug(1000, "out");
         return tmpstr;
 }
@@ -5886 +5703 @@
 char* ostrstr(char* str, char* search)
 {
-        //debug(1000, "in");
         char* ret = NULL;
 
@@ -5892 +5708 @@
         ret = strstr(str, search);
 
-        //debug(1000, "out");
         return ret;
 }
@@ -5898 +5713 @@
 int file_exist(char* filename)
 {
-        debug(1000, "in");
         if(access(filename, F_OK) == 0)
                 return 1;
@@ -5907 +5721 @@
 char* string_newline(char* str)
 {
-        debug(1000, "in");
         if(str == NULL) return NULL;
 
@@ -5914 +5727 @@
         if(str[size - 1] == '\n')
                 str[size - 1] = '\0';
-        debug(1000, "out");
+
         return str;
 }
@@ -5920 +5733 @@
 char* string_quote(char* str)
 {
-        debug(1000, "in");
         char* tmpstr = NULL;
 
         tmpstr = ostrcat("\"", str, 0, 0);
         tmpstr = ostrcat(tmpstr, "\"", 1, 0);
-        debug(1000, "out");
+
         return tmpstr;
 }
@@ -5931 +5743 @@
 struct splitstr* strsplit(char *str, char *tok, int* count)
 {
-        debug(1000, "in");
         char *tmpstr = NULL;
         struct splitstr *tmparray = NULL;
@@ -5950 +5761 @@
         }
 
-        debug(1000, "out");
         return tmparray;
 }
@@ -6351 +6161 @@
         }
 
-        debug(1000, "out");
         return input;
 }
@@ -6357 +6166 @@
 char* string_deltags(char* str)
 {
-        debug(1000, "in");
         int i = 0, y = 0, len = 0;
 
@@ -6380 +6188 @@
         str[y] = '\0';
 
-        debug(1000, "out");
         return str;
 }
@@ -6386 +6193 @@
 char* string_striptags(char* str)
 {
-        debug(1000, "in");
         int i = 0, len = 0;
 
@@ -6407 +6213 @@
         }       
 
-        debug(1000, "out");
         return strstrip(str);
 }
@@ -6413 +6218 @@
 char* string_resub(char* str, char* str2, char* input, int dir)
 {
-        debug(1000, "in");
         int len;
         char* tmpstr = NULL, *pos = NULL, *pos2 = NULL;
@@ -6442 +6246 @@
         tmpstr = strndup(pos, pos2 - pos);
 
-        debug(1000, "out");
         return strstrip(tmpstr);
 }

titan/titan/gmultiepg.h

@@ -89 +89 @@
         if(chnode == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }

titan/titan/harddisk.h

@@ -37 +37 @@
 struct hdd* gethdd(char* device)
 {
-        debug(1000, "in");
         struct hdd *node = hdd;
 
@@ -43 +42 @@
         {
                 if(ostrcmp(node->device, device) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
                 node = node->next;
         }
@@ -796 +792 @@
 void delhdd(char* device, int flag)
 {
-        debug(1000, "in");
         if(flag == 0) m_lock(&status.hddmutex, 13);
         struct hdd *node = hdd, *prev = hdd;
@@ -833 +828 @@
         }
         if(flag == 0) m_unlock(&status.hddmutex, 13);
-        debug(1000, "out");
 }
 
@@ -840 +834 @@
 struct hdd* addhdd(char* device, int partition, unsigned long size, int removable, char* vendor, char *model, char* label, char* filesystem, char* uuid, int timetosleep, struct hdd* last, int flag)
 {
-        debug(1000, "in");
         if(flag == 0) m_lock(&status.hddmutex, 13);
         struct hdd *newnode = NULL, *prev = NULL, *node = hdd;
@@ -893 +886 @@
 
         if(flag == 0) m_unlock(&status.hddmutex, 13);
-        debug(1000, "out");
         return newnode;
 }
@@ -901 +893 @@
 void freehdd(int flag)
 {
-        debug(1000, "in");
         if(flag == 0) m_lock(&status.hddmutex, 13);
         struct hdd *node = hdd, *prev = hdd;
@@ -912 +903 @@
                         delhdd(prev->device, 1);
         }
-        debug(1000, "out");
         if(flag == 0) m_unlock(&status.hddmutex, 13);
 }

titan/titan/i386port.h

@@ -112 +112 @@
 void blitrect(int posx, int posy, int width, int height, long color, int transparent, int mode)
 {
-        //debug(1000, "in");
         int y, x;
         unsigned long tmpcol;
@@ -153 +152 @@
                         drawpixel(posx + width - 1, posy + y, tmpcol);
         }
-        //debug(1000, "out");
 }
 
@@ -200 +198 @@
 void sighandler(int sig, struct sigcontext ctx)
 {
-
-        debug(1000, "in");
         switch(sig)
         {
@@ -243 +239 @@
                 }
         }
-        debug(1000, "out");
 }
 

titan/titan/inadyn.h

@@ -4 +4 @@
 int readinadyn(const char* filename, char** user, char** pw, char** host, char** system)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *tmpstr = NULL;

titan/titan/inetwork.h

@@ -4 +4 @@
 void delinetworkfound()
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork;
 
@@ -16 +15 @@
 struct inetwork* getinetworkfirstwlan()
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork;
 
@@ -22 +20 @@
         {
                 if(ostrcmp(node->device, "ra0") == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
                 if(ostrcmp(node->device, "wlan0") == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -39 +31 @@
 struct inetwork* getinetworkbydevice(char* device)
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork;
 
@@ -45 +36 @@
         {
                 if(ostrcmp(node->device, device) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -58 +46 @@
 void delinetwork(char* device)
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork, *prev = inetwork;
         
@@ -92 +79 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 void delinetworknotfound()
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork, *prev = inetwork;
 
@@ -107 +92 @@
                         delinetwork(prev->device);
         }
-        debug(1000, "out");
 }
 
@@ -170 +154 @@
 struct inetwork* addinetwork(char* device, char* ip, char* netmask, char* mac, char* broadcast, int type, struct inetwork* last)
 {
-        debug(1000, "in");
         struct inetwork *newnode = NULL, *prev = NULL, *node = inetwork;
 
@@ -227 +210 @@
         newnode->next = node;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -446 +428 @@
 void freeinetwork()
 {
-        debug(1000, "in");
         struct inetwork *node = inetwork, *prev = inetwork;
 
@@ -456 +437 @@
                         delinetwork(prev->device);
         }
-        debug(1000, "out");
 }
 

titan/titan/keyactions.h

@@ -8 +8 @@
 void screenkeyactions(int key, int flag)
 {
-        debug(1000, "in");
-
         char* keyconf = NULL;
         struct skin* pluginnode = NULL;
@@ -162 +160 @@
         resettvpic();
         freemenulist(mlist, 1); mlist = NULL;
-        debug(1000, "out");
         return;
 }

titan/titan/language.h

@@ -7 +7 @@
 int screenlanguage(int flag)
 {
-        debug(1000, "in");
         int rcret = 0, change = 0, reloadskin = 0;
         struct skin* language = getscreen("language");
@@ -14 +13 @@
         if(listbox == NULL || language == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -68 +67 @@
                 readscreen(getconfig("skinfile", NULL), 0, 0);
         }
-        debug(1000, "out");
         return 0;
 }

titan/titan/linkedchannel.h

@@ -160 +160 @@
 struct linkedchannel* addlinkedchannel(struct channel* chnode, int serviceid, uint64_t transponderid, time_t starttime, time_t endtime, struct linkedchannel* last)
 {
-        debug(1000, "in");
         struct linkedchannel *newnode = NULL, *prev = NULL, *node = NULL;
 
         if(chnode == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -205 +204 @@
 
         m_unlock(&status.linkedchannelmutex, 14);
-        debug(1000, "out");
         return newnode;
 }
@@ -215 +213 @@
         if(chnode == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return;
         }
@@ -245 +243 @@
 void freelinkedchannel(struct channel* chnode)
 {
-        debug(1000, "in");
         struct linkedchannel *node = NULL, *prev = NULL;
 
         if(chnode == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return;
         }
@@ -268 +265 @@
         }
         m_unlock(&status.linkedchannelmutex, 14);
-        debug(1000, "out");
 }
 

titan/titan/list.h

@@ -20 +20 @@
 struct clist* addlisttmp(struct clist **clist, char *key1, char *value1)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *newnode = NULL, *node = NULL, *prev = NULL;
@@ -28 +27 @@
         if(key1 == NULL || value1 == NULL)
         {
-                debug(1000, "out -> NULL dedect");
                 m_unlock(&status.clistmutex, 12);
                 return NULL;
@@ -85 +83 @@
                                 free(node->tmp);
                                 node->tmp = value;
-                                debug(1000, "out -> key %s found, use change instread add", key);
                                 m_unlock(&status.clistmutex, 12);
                                 return newnode;
@@ -97 +94 @@
                 clist[hash] = newnode;
 
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
         return newnode;
@@ -104 +100 @@
 struct clist* addlistdef(struct clist **clist, char *key1, char *value1)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *newnode = NULL, *node = NULL, *prev = NULL;
@@ -112 +107 @@
         if(key1 == NULL || value1 == NULL)
         {
-                debug(1000, "out -> NULL dedect");
                 m_unlock(&status.clistmutex, 12);
                 return NULL;
@@ -169 +163 @@
                                 free(node->def);
                                 node->def = value;
-                                debug(1000, "out -> key %s found, use change instread add", key);
                                 m_unlock(&status.clistmutex, 12);
                                 return newnode;
@@ -181 +174 @@
                 clist[hash] = newnode;
 
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
         return newnode;
@@ -188 +180 @@
 struct clist* addlist(struct clist **clist, char *key1, char *value1)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *newnode = NULL, *node = NULL, *prev = NULL;
@@ -196 +187 @@
         if(key1 == NULL || value1 == NULL)
         {
-                debug(1000, "out -> NULL dedect");
                 m_unlock(&status.clistmutex, 12);
                 return NULL;
@@ -259 +249 @@
                                 free(node->value);
                                 node->value = value;
-                                debug(1000, "out -> key %s found, use change instread add", key);
                                 m_unlock(&status.clistmutex, 12);
                                 return node;
@@ -271 +260 @@
                 clist[hash] = newnode;
 
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
         return newnode;
@@ -278 +266 @@
 int writelist(struct clist **clist, const char *filename)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         FILE *fd = NULL;
@@ -318 +305 @@
         
         fclose(fd);
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
         return 0;
@@ -325 +311 @@
 char* getlistbyval(struct clist **clist, char *value, char *ext)
 {
-        //debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL;
@@ -351 +336 @@
                         {
                                 free(tmpstr);
-                                //debug(1000, "out");
                                 m_unlock(&status.clistmutex, 12);
                                 return node->key;
@@ -367 +351 @@
 char* getlistnotmp(struct clist **clist, char *key, char *ext)
 {
-        //debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL;
@@ -392 +375 @@
                 {
                         free(tmpstr);
-                        //debug(1000, "out");
                         if(node->value != NULL)
                         {
@@ -415 +397 @@
 char* getlist(struct clist **clist, char *key, char *ext)
 {
-        //debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL;
@@ -440 +421 @@
                 {
                         free(tmpstr);
-                        //debug(1000, "out");
                         if(node->tmp != NULL && strlen(node->tmp) > 0)
                         {
@@ -470 +450 @@
 void dellist(struct clist **clist, char *key, int flag)
 {
-        debug(1000, "in");
         if(flag == 0) m_lock(&status.clistmutex, 12);
         struct clist *node = NULL, *prev = NULL;
@@ -514 +493 @@
                 node = node->next;
         }
-        debug(1000, "out");
         if(flag == 0) m_unlock(&status.clistmutex, 12);
 }
@@ -520 +498 @@
 void dellisttmpall(struct clist **clist)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL, *prev = NULL;
@@ -546 +523 @@
                 }
         }
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
 }
@@ -552 +528 @@
 void dellisttmp(struct clist **clist, char *key)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL, *prev = NULL;
@@ -579 +554 @@
                 node = node->next;
         }
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
 }
@@ -585 +559 @@
 void freelist(struct clist** clist)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL, *prev = NULL;
@@ -601 +574 @@
                 }
         }
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
 }
@@ -607 +579 @@
 int writelisttmp(struct clist **clist)
 {
-        debug(1000, "in");
         m_lock(&status.clistmutex, 12);
         struct clist *node = NULL;
@@ -646 +617 @@
         }
 
-        debug(1000, "out");
         m_unlock(&status.clistmutex, 12);
         return ret;

titan/titan/mainbouquets.h

@@ -61 +61 @@
 struct mainbouquet* getlastmainbouquet(struct mainbouquet* node)
 {
-        debug(1000, "in");
         struct mainbouquet *prev = NULL;
 
@@ -70 +69 @@
         }
 
-        debug(1000, "out");
         return prev;
 }
@@ -122 +120 @@
         if(node == NULL || mainbouquet == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -155 +153 @@
         if(node == NULL || mainbouquet == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -205 +203 @@
         if(node == NULL || mainbouquet == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -230 +228 @@
         if(node == NULL || mainbouquet == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -277 +275 @@
 struct mainbouquet* addmainbouquet(char *line, int count, struct mainbouquet* last)
 {
-        debug(1000, "in");
         struct mainbouquet *newnode = NULL, *prev = NULL, *node = mainbouquet;
         char *name = NULL, *filename = NULL;
@@ -352 +349 @@
         if(node != NULL) node->prev = newnode;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -358 +354 @@
 int readmainbouquet(char* filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *tmpstr = NULL, *tmpstr0 = NULL, *tmpstr1 = NULL;
@@ -441 +436 @@
 struct mainbouquet* getmainbouquetbybouquetpointer(struct bouquet* bouquetnode)
 {
-        debug(1000, "in");
         struct mainbouquet *node = mainbouquet;
         struct bouquet *bnode = NULL;
@@ -451 +445 @@
                 {
                         if(bnode == bouquetnode)
-                        {
-                                debug(1000, "out");
                                 return node;
-                        }
+
                         bnode = bnode->next;
                 }
@@ -465 +457 @@
 struct mainbouquet* getmainbouquetbyfilename(char *filename)
 {
-        debug(1000, "in");
         struct mainbouquet *node = mainbouquet;
 
@@ -471 +462 @@
         {
                 if(ostrcmp(node->filename, filename) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -484 +472 @@
 struct mainbouquet* getmainbouquet(char *name)
 {
-        debug(1000, "in");
         struct mainbouquet *node = mainbouquet;
 
@@ -490 +477 @@
         {
                 if(ostrcmp(node->name, name) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -505 +489 @@
 void delmainbouquet(char *name, int flag)
 {
-        debug(1000, "in");
         struct mainbouquet *node = mainbouquet, *prev = mainbouquet;
 
@@ -543 +526 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 void freemainbouquet()
 {
-        debug(1000, "in");
         struct mainbouquet *node = mainbouquet, *prev = mainbouquet;
 
@@ -558 +539 @@
                         delmainbouquet(prev->name, 0);
         }
-        debug(1000, "out");
 }
 
@@ -574 +554 @@
 int writemainbouquet(const char *filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct mainbouquet *node = mainbouquet;
@@ -597 +576 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }

titan/titan/mediadb.h

@@ -147 +147 @@
         if(node == NULL || mediadb == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -196 +196 @@
         if(node == NULL || mediadb == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -286 +286 @@
         
         m_unlock(&status.mediadbmutex, 17);
-        //debug(1000, "out");
         return newnode;
 }
@@ -368 +367 @@
         
         if(flag == 0) m_unlock(&status.mediadbmutex, 17);
-        //debug(1000, "out");
         return newnode;
 }
@@ -454 +452 @@
 struct mediadb* addmediadb(char *line, int len, int count, struct mediadb* last, int sort, int flag)
 {
-        //debug(1000, "in");
         struct mediadb *newnode = NULL, *prev = NULL, *node = NULL;
         int ret = 0;
@@ -516 +513 @@
 
         if(flag == 0) m_unlock(&status.mediadbmutex, 17);
-        //debug(1000, "out");
         return newnode;
 }
@@ -613 +609 @@
 int readmediadb(const char* filename, int type, int flag)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -709 +704 @@
 int delmediadbfilter(struct mediadbfilter* mnode, int flag)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -744 +738 @@
 
         if(flag == 0) m_unlock(&status.mediadbmutex, 17);
-        debug(1000, "out");
         return ret;
 }
@@ -750 +743 @@
 int delmediadbcategory(struct mediadbcategory* mnode, int flag)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -788 +780 @@
 
         m_unlock(&status.mediadbmutex, 17);
-        debug(1000, "out");
         return ret;
 }
@@ -794 +785 @@
 int delmediadb(struct mediadb* mnode, int flag)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -836 +826 @@
 
         m_unlock(&status.mediadbmutex, 17);
-        debug(1000, "out");
         return ret;
 }
@@ -842 +831 @@
 void freemediadbfilter(int flag)
 {
-        debug(1000, "in");
         struct mediadbfilter *node = mediadbfilter, *prev = mediadbfilter;
 
@@ -852 +840 @@
                         delmediadbfilter(prev, flag);
         }
-        debug(1000, "out");
 }
 
 void freemediadbcategory(int flag)
 {
-        debug(1000, "in");
         struct mediadbcategory *node = mediadbcategory, *prev = mediadbcategory;
 
@@ -867 +853 @@
                         delmediadbcategory(prev, flag);
         }
-        debug(1000, "out");
 }
 
 void freemediadb(int flag)
 {
-        debug(1000, "in");
         struct mediadb *node = mediadb, *prev = mediadb;
 
@@ -884 +868 @@
 
         status.writemediadb = 0;
-        debug(1000, "out");
 }
 
 int writemediadbcategory(const char *filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct mediadbcategory *node = NULL;
@@ -917 +899 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }
@@ -923 +904 @@
 int writemediadb(const char *filename, struct mediadb* cmediadb)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct mediadb *node = NULL;
@@ -979 +959 @@
         fclose(fd);
         status.writemediadb = 0;
-        debug(1000, "out");
         return 0;
 }

titan/titan/menu.h

@@ -80 +80 @@
 struct skin* menu(struct skin* menu, int flag)
 {
-        debug(1000, "in");
         int rcret = 0, ret = 0;
         struct skin* listbox = getscreennode(menu, "listbox");
@@ -91 +90 @@
         if(listbox == NULL || menu == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -168 +167 @@
         delownerrc(menu);
         clearscreen(menu);
-        debug(1000, "out");
         return listbox->select;
 }
@@ -174 +172 @@
 int menucall(struct skin* menunode, struct skin* menuentry, int check)
 {
-        debug(1000, "in");
-
         void (*startplugin) (void);
         int ret = 0, pincheck = 0;
@@ -182 +178 @@
         if(menuentry == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -188 +184 @@
         if(!(menuentry->type & MENU)) return 1;
         
-        debug(1000, "menuentry->name=%s", menuentry->name);
+        debug(100, "menuentry->name=%s", menuentry->name);
                 
         tmpstr = ostrcat("protect_", menuentry->name, 0, 0);
@@ -847 +843 @@
 
         resettvpic();
-        debug(1000, "out");
         return ret;
 }

titan/titan/menulist.h

@@ -4 +4 @@
 void freemenulist(struct menulist* mlist, int delparam)
 {
-        debug(1000, "in");
         struct menulist *node = mlist, *prev = mlist;
 
@@ -35 +34 @@
                 }
         }
-        debug(1000, "out");
 }
 
@@ -134 +132 @@
 struct menulist* menulistboxext(struct menulist* mlist, char* paramskinname, char* skintitle, char* paramskinpath, char* defaultpic, int showpng, int* rcreturn, int flag)
 {
-        debug(1000, "in");
         int rcret = 0, fromthread = 0;
         struct skin* framebuffer = getscreen("framebuffer");
@@ -316 +313 @@
                 clearscreen(screen);
 
-        debug(1000, "out");
         return ret;
 }

titan/titan/mipselport.h

@@ -376 +376 @@
 void blitrect(int posx, int posy, int width, int height, long color, int transparent, int mode)
 {
-        //debug(1000, "in");
         int y, x;
         unsigned long tmpcol;
@@ -417 +416 @@
                         drawpixel(posx + width - 1, posy + y, tmpcol);
         }
-        //debug(1000, "out");
 
 /*
@@ -698 +696 @@
 void sighandler(int sig, struct sigcontext ctx)
 {
-        debug(1000, "in");
         switch(sig)
         {
@@ -755 +752 @@
                 }
         }
-        debug(1000, "out");
-}
-
-#endif
+}
+
+#endif

titan/titan/mostzap.h

@@ -47 +47 @@
         if(node == NULL || mostzap == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -80 +80 @@
 struct mostzap* addmostzap(char* line, int count, struct mostzap* last)
 {
-        //debug(1000, "in");
         struct mostzap *newnode = NULL, *prev = NULL, *node = mostzap;
         int ret = 0;
@@ -121 +120 @@
         if(node != NULL) node->prev = newnode;
         
-        //debug(1000, "out");
         return newnode;
 }
@@ -152 +150 @@
 int readmostzap(const char* filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -196 +193 @@
 int delmostzap(int serviceid, uint64_t transponderid, int flag)
 {
-        debug(1000, "in");
         int ret = 1;
         struct mostzap *node = mostzap, *prev = mostzap;
@@ -228 +224 @@
         }
 
-        debug(1000, "out");
         return ret;
 }
@@ -234 +229 @@
 void freemostzap(int flag)
 {
-        debug(1000, "in");
         struct mostzap *node = mostzap, *prev = mostzap;
 
@@ -244 +238 @@
                         delmostzap(prev->serviceid, prev->transponderid, flag);
         }
-        debug(1000, "out");
 }
 
 int writemostzap(const char *filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct mostzap *node = mostzap;
@@ -276 +268 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }

titan/titan/multiepg.h

@@ -36 +36 @@
         if(chnode == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }

titan/titan/network.h

@@ -4 +4 @@
 int readwlan(const char* filename, char** type, char** ssid, char** key)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *tmpstr = NULL;

titan/titan/newsletter.h

@@ -91 +91 @@
 int readnewsletter()
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char* fileline = NULL;

titan/titan/numinput.h

@@ -4 +4 @@
 char* numinput(char* title, char* num, char* mask, int isip)
 {
-        debug(1000, "in");
         int rcret = -1, fromthread = 0, height = 0;
         struct skin* numinput = getscreen("numinput");
@@ -78 +77 @@
 
         numinput->height = height;
-        debug(1000, "out");
         return ret;
 }

titan/titan/oldentry.h

@@ -26 +26 @@
 struct oldentry* addoldentry(void* entry, int type, time_t del, struct oldentry* last)
 {
-        debug(1000, "in");
         struct oldentry *newnode = NULL, *node = NULL;
 
@@ -60 +59 @@
 
         m_unlock(&status.oldentrymutex, 18);
-        debug(1000, "out");
         return newnode;
 }
@@ -68 +66 @@
 void deloldentry(struct oldentry *entry, int flag)
 {
-        debug(1000, "in");
-
         if(flag == 0) m_lock(&status.oldentrymutex, 18);
         struct oldentry *node = oldentry, *prev = oldentry;
@@ -101 +97 @@
 
         if(flag == 0) m_unlock(&status.oldentrymutex, 18);
-        debug(1000, "out");
 }
 
 void freeoldentry()
 {
-        debug(1000, "in");
-
         m_lock(&status.oldentrymutex, 18);
         struct oldentry *node = oldentry, *prev = oldentry;
@@ -120 +113 @@
 
         m_unlock(&status.oldentrymutex, 18);
-        debug(1000, "out");
 }
 

titan/titan/pic.h

@@ -29 +29 @@
 struct pic* addpic(char *name, unsigned char* picbuf, int memfd, unsigned long width, unsigned long height, unsigned long rowbytes, int channels, int timeout, int del, struct pic* last)
 {
-        debug(1000, "in");
-
         //chech if pic timed out and can remove
         checkpictimeout();
@@ -78 +76 @@
         newnode->next = node;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -100 +97 @@
 void delpic(char* name)
 {
-        debug(1000, "in");
         struct pic *node = pic, *prev = pic;
         char* tmpstr = NULL;
@@ -126 +122 @@
         }
         free(tmpstr);
-        debug(1000, "out");
 }
 
 void delmarkedpic(int del)
 {
-        debug(1000, "in");
         struct pic *node = pic, *prev = pic;
 
@@ -153 +147 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 struct pic* getpic(char* name)
 {
-        debug(1000, "in");
         struct pic *node = pic;
         char* tmpstr = NULL;
@@ -168 +160 @@
                 if(ostrcmp(node->name, tmpstr) == 0)
                 {
-                        debug(1000, "out");
                         free(tmpstr);
                         node->lastaccess = time(NULL);
@@ -183 +174 @@
 void freepic()
 {
-        debug(1000, "in");
         struct pic *node = pic, *prev = pic;
 
@@ -193 +183 @@
                         delpic(prev->name);
         }
-        debug(1000, "out");
 }
 

titan/titan/pip.h

@@ -9 +9 @@
 int pipstartreal(struct channel* chnode, char* pin, int flag)
 {
-        debug(1000, "in");
         struct transponder* tpnode = NULL;
         struct dvbdev *fenode = NULL;
@@ -288 +287 @@
         m_unlock(&status.servicemutex, 2);
         
-        debug(1000, "out");
         return 0;
 }

titan/titan/playlist.h

@@ -22 +22 @@
 struct playlist* getlastplaylist(struct playlist* node)
 {
-        debug(1000, "in");
         struct playlist *prev = NULL;
 
@@ -31 +30 @@
         }
 
-        debug(1000, "out");
         return prev;
 }
@@ -42 +40 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -49 +47 @@
         if(mainplaylistnode == NULL)
         {
-                debug(1000, "NULL detect");
                 err("NULL detect");
                 return 1;
@@ -100 +97 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -107 +104 @@
         if(mainplaylistnode == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -175 +172 @@
 struct playlist* addplaylist(struct playlist **firstnode, char *line, int count, struct playlist* last)
 {
-        //debug(1000, "in");
         struct playlist *newnode = NULL, *prev = NULL, *node = *firstnode;
         int ret = 0;
@@ -240 +236 @@
         if(node != NULL) node->prev = newnode;
 
-        //debug(1000, "out");
         return newnode;
 }
@@ -246 +241 @@
 int readplaylist(char* filename, struct playlist** firstnode)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -293 +287 @@
 void delplaylist(char* file, struct playlist** firstnode)
 {
-        debug(1000, "in");
         struct playlist *node = *firstnode, *prev = *firstnode;
 
@@ -325 +318 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 void freeplaylist(struct playlist** firstnode)
 {
-        debug(1000, "in");
         struct playlist *node = *firstnode, *prev = *firstnode;
 
@@ -340 +331 @@
                         delplaylist(prev->file, firstnode);
         }
-        debug(1000, "out");
 }
 
 int writeplaylist(const char *filename, struct playlist *node)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         int ret = 0;
@@ -367 +356 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }

titan/titan/provider.h

@@ -4 +4 @@
 int getlastproviderid()
 {
-        debug(1000, "in");
         int lastid = 0;
         struct provider *node = provider, *prev = NULL;
@@ -16 +15 @@
         }
 
-        debug(1000, "out");
         return lastid;
 }
@@ -22 +20 @@
 struct provider* getlastprovider(struct provider* node)
 {
-        debug(1000, "in");
         struct provider *prev = NULL;
 
@@ -31 +28 @@
         }
 
-        debug(1000, "out");
         return prev;
 }
@@ -42 +38 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -69 +65 @@
         if(node == NULL || provider == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -119 +115 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -140 +136 @@
         if(node == NULL || provider == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -187 +183 @@
 struct provider* addprovider(char *line, int count, struct provider* last)
 {
-        //debug(1000, "in");
         struct provider *newnode = NULL, *prev = NULL, *node = provider;
         char *name = NULL;
@@ -251 +246 @@
         if(node != NULL) node->prev = newnode;
 
-        //debug(1000, "out");
         return newnode;
 }
@@ -257 +251 @@
 int readprovider(const char* filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *tmpstr = NULL, *tmpstr0 = NULL, *tmpstr1 = NULL;
@@ -322 +315 @@
 void delprovider(int providerid)
 {
-        debug(1000, "in");
         struct provider *node = provider, *prev = provider;
 
@@ -354 +346 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
@@ -374 +365 @@
 struct provider* getproviderbyname(char* name)
 {
-        debug(1000, "in");
         struct provider *node = provider;
 
@@ -380 +370 @@
         {
                 if(ostrcmp(node->name, name) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -393 +380 @@
 struct provider* getprovider(int providerid)
 {
-        //debug(1000, "in");
         struct provider *node = provider;
 
@@ -399 +385 @@
         {
                 if(node->providerid == providerid)
-                {
-                        //debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -470 +453 @@
 void freeprovider()
 {
-        debug(1000, "in");
         struct provider *node = provider, *prev = provider;
 
@@ -480 +462 @@
                         delprovider(prev->providerid);
         }
-        debug(1000, "out");
 }
 
 int writeprovider(const char *filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct provider *node = provider;
@@ -508 +488 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }

titan/titan/queue.h

@@ -15 +15 @@
 struct queue* addqueue(int type, void* data, int len, void* data1, int len1, int flag, struct queue* last)
 {
-        //debug(1000, "in");
-
         m_lock(&status.queuemutex, 11);
 
@@ -85 +83 @@
         if(node != NULL) node->prev = queue;
 
-        //debug(1000, "out");
         m_unlock(&status.queuemutex, 11);
         return newnode;
@@ -94 +91 @@
 void delqueue(struct queue* queuenode, int flag)
 {
-        debug(1000, "in");
         if(flag == 0) m_lock(&status.queuemutex, 11);
         struct queue *node = queue, *prev = queue;
@@ -130 +126 @@
         }
         if(flag == 0) m_unlock(&status.queuemutex, 11);
-        debug(1000, "out");
 }
 
 struct queue* getqueue(int type)
 {
-        //debug(1000, "in");
         m_lock(&status.queuemutex, 11);
         struct queue *node = queue;
@@ -143 +137 @@
                 if(node->type == type)
                 {
-                        //debug(1000, "out");
                         m_unlock(&status.queuemutex, 11);
                         return node;
@@ -156 +149 @@
 void freequeue()
 {
-        debug(1000, "in");
         m_lock(&status.queuemutex, 11);
         struct queue *node = queue, *prev = queue;
@@ -168 +160 @@
         }
         m_unlock(&status.queuemutex, 11);
-        debug(1000, "out");
 }
 

titan/titan/rc.h

@@ -79 +79 @@
 struct rc* getrc(int key, struct skin* owner)
 {
-        debug(1000, "in");
         struct rc *node = rc;
 
@@ -85 +84 @@
         {
                 if(node->key == key && node->owner == owner)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -98 +94 @@
         {
                 if(node->key == key && node->owner == NULL)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -110 +103 @@
 int openrc()
 {
-        debug(1000, "in");
         char *rcdev = NULL;
         int i = 0;
@@ -139 +131 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -145 +136 @@
 void closerc()
 {
-        debug(1000, "in");
-
         if(status.fdrc != -1)
                 close(status.fdrc);
-
-        debug(1000, "out");
 }
 
@@ -221 +208 @@
 int waitrcext(struct skin* owner, unsigned int timeout, int screencalc, int filelistview)
 {
-        debug(1000, "in");
         fd_set rfds;
         struct timeval tv;
@@ -359 +345 @@
         }
 
-        debug(1000, "out");
         if(ret != RCTIMEOUT)
                 status.lastrcaction = time(NULL);
@@ -372 +357 @@
 struct rc* addrc(int key, void *func, struct skin* screen, struct skin *screennode)
 {
-        debug(1000, "in");
         struct rc *newnode, *node = rc;
         struct rc **nodeaddr;
@@ -401 +385 @@
                                 free(newnode);
                                 newnode = NULL;
-                                debug(1000, "out -> key %d found, use change instread add", key);
                                 return node;
                         }
@@ -412 +395 @@
                 rc = newnode;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -418 +400 @@
 void delrc(int key, struct skin* owner, struct skin* screennode)
 {
-        debug(1000, "in");
         struct rc *node = rc, *prev = rc;
 
@@ -438 +419 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 void delownerrc(struct skin* owner)
 {
-        debug(1000, "in");
         struct rc *node = rc, *prev = rc;
 
@@ -453 +432 @@
                         delrc(prev->key, prev->owner, prev->screennode);
         }
-        debug(1000, "out");
 }
 
 void freerc()
 {
-        debug(1000, "in");
         struct rc *node = rc, *prev = rc;
 
@@ -468 +445 @@
                         delrc(prev->key, prev->owner, prev->screennode);
         }
-        debug(1000, "out");
 }
 

titan/titan/rcconfig.h

@@ -53 +53 @@
 struct clist* addrcconfigint(char *key, int value)
 {
-        debug(1000, "in");
         char* fileline = NULL;
         struct clist* ret = NULL;
@@ -61 +60 @@
 
         free(fileline);
-        debug(1000, "out");
         return ret;
 }
@@ -67 +65 @@
 int readrcconfig(const char *filename, struct clist** tmprcconfig)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *pos;
@@ -108 +105 @@
         fclose(fd);
         free(fileline);
-        debug(1000, "out");
         return 0;
 }
@@ -166 +162 @@
 int reloadrcconfig(char *filename)
 {
-        debug(1000, "in");
         int ret = 0;
 
@@ -173 +168 @@
         if(ret != 0)
         {
-                debug(1000, "out -> readrcconfig fail");
+                err("readrcconfig fail");
                 return 1;
         }
 
-        debug(1000, "out");
         return 0;
 }

titan/titan/rcfunc.h

@@ -4 +4 @@
 void progressbarright(struct skin* screen, struct skin* progressbar, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(progressbar != NULL)
         {
@@ -16 +14 @@
                         progressbar->progresssize = 100;
         }
-
-        debug(1000, "out");
 }
 
 void progressbarleft(struct skin* screen, struct skin* progressbar, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(progressbar != NULL)
         {
@@ -34 +28 @@
                         progressbar->progresssize = 0;
         }
-
-        debug(1000, "out");
 }
 
 void filelistok(struct skin* screen, struct skin* filelist, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         struct skin* path = NULL;
         char* tmp = NULL, *lastdir = NULL, *plastdir = NULL;
@@ -85 +76 @@
                 }
         }
-        debug(1000, "out");
 }
 
@@ -112 +102 @@
 void inputboxchar(struct skin* screen, struct skin* inputbox, char zeichen, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(inputbox != NULL && inputbox->input != NULL)
         {
@@ -122 +111 @@
                 }
         }
-        debug(1000, "out");
 }
 
 void inputboxff(struct skin* screen, struct skin* inputbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(inputbox != NULL)
         {
@@ -135 +122 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void inputboxfr(struct skin* screen, struct skin* inputbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(inputbox != NULL && inputbox->input != NULL)
         {
@@ -146 +131 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void checkinputboxnumright(struct skin* inputbox)
 {
-        debug(1000, "in");
         int count = 0;
 
@@ -171 +154 @@
                 }
         }
-        debug(1000, "out");
 }
 
 void checkinputboxnumleft(struct skin* inputbox)
 {
-        debug(1000, "in");
         int count = 0;
 
@@ -196 +177 @@
                 }
         }
-        debug(1000, "out");
 }
 
 void inputboxright(struct skin* screen, struct skin* inputbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(inputbox != NULL && inputbox->input != NULL)
         {
@@ -211 +189 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void inputboxleft(struct skin* screen, struct skin* inputbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(inputbox != NULL && inputbox->input != NULL)
         {
@@ -226 +201 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
@@ -556 +530 @@
 void choiceboxleft(struct skin* screen, struct skin* choicebox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(choicebox != NULL)
         {
@@ -565 +538 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void choiceboxright(struct skin* screen, struct skin* choicebox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(choicebox != NULL)
         {
@@ -582 +553 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void griddown(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         int end = 0, br = 0, mark = 0;
         struct skin* node = NULL;
@@ -643 +612 @@
                 drawscreen(screen, screencalc, flag);
         }
-
-        debug(1000, "out");
 }
 
 void gridup(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         int start = 0, br = 0, mark = 0;
         struct skin* node = NULL, *tmpnode = NULL;;
@@ -714 +680 @@
                 drawscreen(screen, screencalc, flag);
         }
-
-        debug(1000, "out");
 }
 
 void gridleft(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         struct skin* node = NULL;
 
@@ -753 +716 @@
                         grid->gridcol = grid->select->posx + (grid->select->width / 2);
         }
-        debug(1000, "out");
 }
 
 void gridright(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         struct skin* node = NULL;
 
@@ -793 +754 @@
                         grid->gridcol = grid->select->posx + (grid->select->width / 2);
         }
-        debug(1000, "out");
 }
 
 void gridchup(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(grid != NULL)
         {
@@ -811 +769 @@
                         grid->gridcol = grid->select->posx + (grid->select->width / 2);
         }
-
-        debug(1000, "out");
 }
 
 void gridchdown(struct skin* screen, struct skin* grid, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(grid != NULL)
         {
@@ -833 +787 @@
                         grid->gridcol = grid->select->posx + (grid->select->width / 2);
         }
-
-        debug(1000, "out");
 }
 
@@ -840 +792 @@
 void listboxleft(struct skin* screen, struct skin* listbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(listbox != NULL)
         {
@@ -852 +802 @@
                 drawscreen(screen, screencalc, flag);
         }
-
-        debug(1000, "out");
 }
 
 void listboxright(struct skin* screen, struct skin* listbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(listbox != NULL)
         {
@@ -873 +819 @@
                 drawscreen(screen, screencalc, flag);
         }
-
-        debug(1000, "out");
 }
 
 void listboxup(struct skin* screen, struct skin* listbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(listbox != NULL)
         {
@@ -891 +833 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void listboxdown(struct skin* screen, struct skin* listbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
-
         if(listbox != NULL)
         {
@@ -909 +848 @@
                 drawscreen(screen, screencalc, flag);
         }
-        debug(1000, "out");
 }
 
 void textboxup(struct skin* screen, struct skin* textbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(textbox != NULL)
         {
@@ -923 +860 @@
                 }
         }
-        debug(1000, "out");
 }
 
 void textboxdown(struct skin* screen, struct skin* textbox, int screencalc, int filelistview, int flag)
 {
-        debug(1000, "in");
         if(textbox != NULL)
         {
@@ -937 +872 @@
                 }
         }
-        debug(1000, "out");
 }
 
 int addscreenrc(struct skin* screen, struct skin* node)
 {
-        debug(1000, "in");
-
         if(node == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -1023 +955 @@
         }
 
-        debug(1000, "out");
         return 0;
 }
@@ -1029 +960 @@
 int delscreenrc(struct skin* screen, struct skin* node)
 {
-        debug(1000, "in");
-
         if(node == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -1110 +1039 @@
         }
 
-        debug(1000, "out");
         return 0;
 }

titan/titan/rcmap.h

@@ -4 +4 @@
 struct rcmap* addrcmap(char *line, int count, struct rcmap* last)
 {
-        debug(1000, "in");
         struct rcmap *newnode = NULL, *prev = NULL, *node = rcmap;
         char *name = NULL, *key = NULL, *newkey = NULL;
@@ -87 +86 @@
         newnode->next = node;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -93 +91 @@
 int readrcmap(const char* filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL;
@@ -139 +136 @@
 void delrcmap(char* name)
 {
-        debug(1000, "in");
         struct rcmap *node = rcmap, *prev = rcmap;
 
@@ -162 +158 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 struct rcmap* getrcmap(char* name, int key)
 {
-        debug(1000, "in");
         struct rcmap *node = rcmap;
 
@@ -173 +167 @@
         {
                 if(ostrcmp(node->name, name) == 0 && node->key == key)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -186 +177 @@
 void freercmap()
 {
-        debug(1000, "in");
         struct rcmap *node = rcmap, *prev = rcmap;
 
@@ -196 +186 @@
                         delrcmap(prev->name);
         }
-        debug(1000, "out");
 }
 

titan/titan/record.h

@@ -209 +209 @@
 void recordstop(struct service* node, int ret)
 {
-        debug(1000, "in");
         struct stimerthread *recthumbthread = NULL;
         struct rectimer* rectimernode = NULL;
@@ -294 +293 @@
                 }
         }
-
-        debug(1000, "out");
 }
 
@@ -755 +752 @@
         tmpstr = ostrcat(tmpstr, ".ts", 1, 0);
 
-        debug(1000, "out");
         return tmpstr;
 }
@@ -1102 +1098 @@
 struct service* getrecordbyname(char* recname, int type)
 {
-        debug(1000, "in");
         struct service* servicenode = service;
 
         if(recname == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -1125 +1120 @@
 
         return NULL;
-        debug(1000, "out");
 }
 

titan/titan/rectimer.h

@@ -262 +262 @@
 struct rectimer* addrectimernode(char* line, struct rectimer* last)
 {
-        debug(1000, "in");
         char *ret = NULL;
         struct rectimer *newnode = NULL, *prev = NULL, *node = rectimer;
@@ -393 +392 @@
         if(node != NULL) node->prev = newnode;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -587 +585 @@
 int addrectimer(char *buf)
 {
-        debug(1000, "in");
         struct rectimer* node = NULL;
         char* buf1 = buf;
@@ -618 +615 @@
         }
         free(line);
-        debug(1000, "out");
         return 0;
 }
@@ -624 +620 @@
 int readrectimer(char *filename)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -636 +631 @@
                 free(buf);
         }
-        debug(1000, "out");
         return 0;
 }
@@ -644 +638 @@
 void delrectimer(struct rectimer* rectimernode, int write, int flag)
 {
-        debug(1000, "in");
-
         if(flag == 0) m_lock(&status.rectimermutex, 1);
         struct rectimer *node = rectimer, *prev = rectimer;
@@ -713 +705 @@
         if(flag == 0)
                 m_unlock(&status.rectimermutex, 1);
-        debug(1000, "out");
 }
 
 void deloldrectimer()
 {
-        debug(1000, "in");
         struct rectimer *node = rectimer, *prev = rectimer;
 
@@ -728 +718 @@
                         delrectimer(prev, 1, 0);
         }
-        debug(1000, "out");
 }
 
 void freerectimer()
 {
-        debug(1000, "in");
         struct rectimer *node = rectimer, *prev = rectimer;
 
@@ -743 +731 @@
                         delrectimer(prev, 0, 0);
         }
-        debug(1000, "out");
 }
 
@@ -750 +737 @@
 int writerectimer(const char *filename, int flag)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct rectimer *node = NULL;
@@ -823 +809 @@
 
         status.writerectimer = 0;
-        debug(1000, "out");
         return 0;
 }

titan/titan/sat.h

@@ -15 +15 @@
 struct sat* getsatbyorbitalpos(int orbitalpos)
 {
-        debug(1000, "in");
         struct sat *node = sat;
 
@@ -21 +20 @@
         {
                 if(node->orbitalpos == orbitalpos)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -118 +114 @@
 struct sat* getlastsat(struct sat* node)
 {
-        debug(1000, "in");
         struct sat *prev = NULL;
 
@@ -127 +122 @@
         }
 
-        debug(1000, "out");
         return prev;
 }
@@ -138 +132 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -165 +159 @@
         if(node == NULL || sat == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -215 +209 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -236 +230 @@
         if(node == NULL)
         {
-                debug(1000, "NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -283 +277 @@
 struct sat* addsat(char *line, int count, struct sat* last)
 {
-        debug(1000, "in");
         struct sat *newnode = NULL, *prev = NULL, *node = sat;
         char *name = NULL;
@@ -347 +340 @@
         if(node != NULL) node->prev = newnode;
 
-        debug(1000, "out");
         return newnode;
 }
@@ -353 +345 @@
 int readsat(const char* filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *tmpstr = NULL, *tmpstr0 = NULL, *tmpstr1 = NULL;
@@ -418 +409 @@
 void delsat(char *name)
 {
-        debug(1000, "in");
         struct sat *node = sat, *prev = sat;
 
@@ -452 +442 @@
                 node = node->next;
         }
-        debug(1000, "out");
 }
 
 struct sat* getsat(char *name)
 {
-        debug(1000, "in");
         struct sat *node = sat;
 
@@ -463 +451 @@
         {
                 if(ostrstr(node->name, name) != NULL)
-                {
-                        debug(1000, "out");
                         return node;
-                }
 
                 node = node->next;
@@ -476 +461 @@
 void freesat()
 {
-        debug(1000, "in");
         struct sat *node = sat, *prev = sat;
 
@@ -486 +470 @@
                         delsat(prev->name);
         }
-        debug(1000, "out");
 }
 
 int writesat(const char *filename)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         struct sat *node = sat;
@@ -515 +497 @@
 
         fclose(fd);
-        debug(1000, "out");
         return 0;
 }

titan/titan/scart.h

@@ -4 +4 @@
 void screenscart()
 {
-        debug(1000, "in");
         int rcret = 0;
         char* tmpstr = NULL;
@@ -26 +25 @@
                 textbox(_("Message"), _("Videomode must be 576i for Scart"), _("OK"), getrcconfigint("rcok", NULL), _("EXIT"), getrcconfigint("rcexit", NULL), NULL, 0, NULL, 0, 600, 200, 5, 0);
         free(tmpstr); tmpstr = NULL;
-        debug(1000, "out");
         return;
 }

titan/titan/scdev.h

@@ -64 +64 @@
 struct dvbdev* scopen()
 {
-        debug(1000, "in");
         int fd = -1;
         struct dvbdev* node = dvbdev;
@@ -89 +88 @@
         }
 
-        debug(1000, "out");
         return node;
 }
@@ -95 +93 @@
 int scopendirect(char *scdev)
 {
-        debug(1000, "in");
         int fd = -1;
 
@@ -104 +101 @@
 
         closeonexec(fd);
-        debug(1000, "out");
         return fd;
 }
@@ -123 +119 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -141 +137 @@
         if(node == NULL || modes == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -159 +155 @@
         if(node == NULL || modes == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -177 +173 @@
         if(node == NULL || parameters == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -195 +191 @@
         if(node == NULL || parameters == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -213 +209 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -231 +227 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -249 +245 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -267 +263 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -285 +281 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -303 +299 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -321 +317 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -339 +335 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -357 +353 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -373 +369 @@
 int scgetdev()
 {
-        debug(1000, "in");
         int y, fd = -1, count = 0;
         char *buf = NULL, *scdev = NULL;
@@ -380 +375 @@
         if(scdev == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return count;
         }
@@ -404 +399 @@
 
         free(buf);
-        debug(1000, "out");
         return count;
 }

titan/titan/service.h

@@ -64 +64 @@
 int servicestartreal(struct channel* chnode, char* channellist, char* pin, int flag)
 {
-        debug(1000, "in");
         struct transponder* tpnode = NULL;
         struct dvbdev *fenode = NULL;
@@ -581 +580 @@
         }
         
-        debug(1000, "out");
         return 0;
 }
@@ -773 +771 @@
         if(chnode == NULL || tracknode == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return;
         }
@@ -799 +797 @@
 struct service* addservice(struct service* last)
 {
-        debug(1000, "in");
         struct service *newnode = NULL, *node = NULL;
 
@@ -829 +826 @@
                 service = newnode;
 
-        debug(1000, "out");
         m_unlock(&status.servicemutex, 2);
         return newnode;
@@ -851 +847 @@
 void delservice(struct service* snode, int flag)
 {
-        debug(1000, "in");
         m_lock(&status.servicemutex, 2);
         struct service *node = service, *prev = service;
@@ -918 +913 @@
         }
         m_unlock(&status.servicemutex, 2);
-        debug(1000, "out");
 }
 
 void freeservice()
 {
-        debug(1000, "in");
         struct service *node = service, *prev = service;
 
@@ -933 +926 @@
                         delservice(prev, 0);
         }
-        debug(1000, "out");
 }
 

titan/titan/settings_bluebutton.h

@@ -4 +4 @@
 void screensettings_bluebutton()
 {
-        debug(1000, "in");
         char* skintitle = "Blue Key Action - Setup";
         struct skin* plugin = getscreen("plugin");
@@ -49 +48 @@
         freemenulist(mlist, 1); mlist = NULL;
         free(tmpstr); tmpstr = NULL;
-        debug(1000, "out");
         return;
 }

titan/titan/settings_redbutton.h

@@ -4 +4 @@
 void screensettings_redbutton()
 {
-        debug(1000, "in");
         char* skintitle = "Red Key Action - Setup";
         struct skin* plugin = getscreen("plugin");
@@ -50 +49 @@
         freemenulist(mlist, 1); mlist = NULL;
         free(tmpstr); tmpstr = NULL;
-        debug(1000, "out");
         return;
 }

titan/titan/sh4port.h

@@ -24 +24 @@
         if(node == NULL)
         {
-                debug(1000, "out-> NULL detect");
+                err("NULL detect");
                 return 1;
         }
@@ -660 +660 @@
 void sighandler(int sig, struct sigcontext ctx)
 {
-        debug(1000, "in");
         switch(sig)
         {
@@ -710 +709 @@
                 }
         }
-        debug(1000, "out");
 }
 

titan/titan/showiframe.h

@@ -6 +6 @@
 int singlepicstart(const char *filename, int flag)
 {
-        debug(1000, "in -> %s", filename);
         int ret = 0;
 
@@ -74 +73 @@
                 return 1;
         }
-        debug(1000, "out");
         return 0;
 }

titan/titan/skin.h

@@ -27 +27 @@
 void* convertfunc(char *value, uint8_t *rettype)
 {
-        debug(1000, "in");
         *rettype = FUNCTEXT;
 
@@ -221 +220 @@
                 return &getpowerofftime;
 
-        debug(1000, "out");
         return 0;
 }
@@ -227 +225 @@
 long convertcol(char *value)
 {
-//      debug(1000, "in");
         char *ret;
         long col = 0;
@@ -247 +244 @@
         }
 
-//      debug(1000, "out");
         return col;
 }
@@ -253 +249 @@
 int convertxmlentry(char *value, uint8_t *proz)
 {
-//      debug(1000, "in");
         int ret = -1;
         char *buf = NULL;
@@ -338 +333 @@
         }
 
-//      debug(1000, "out");
         return ret;
 }
@@ -344 +338 @@
 struct skin* checkscreen(char* screenname)
 {
-        //debug(1000, "in");
         struct skin* node = skin;
 
@@ -350 +343 @@
         {
                 if(ostrcmp(node->name, screenname) == 0)
-                {
-                        //debug(1000, "out");
                         return node;
-                }
+
                 node = node->next;
         }
@@ -361 +352 @@
 struct skin* getscreen(char* screenname)
 {
-        debug(1000, "in");
         struct skin* node = skin;
 
@@ -367 +357 @@
         {
                 if(ostrcmp(node->name, screenname) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
+
                 node = node->next;
         }
@@ -379 +367 @@
 struct skin* sortscreen(struct skin* node)
 {
-        debug(1000, "in");
         struct skin *nodea = NULL, *nodeb = NULL, *nodec = NULL, *noded = NULL;
         struct skin *nodetmp = NULL;
@@ -386 +373 @@
         if(node == NULL || node == status.skinerr)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -451 +438 @@
         }
 
-        debug(1000, "out");
         return node;
 }
@@ -457 +443 @@
 struct skin* sortscreenbyname(char *screenname)
 {
-        debug(1000, "in");
         struct skin* node = NULL;
 
@@ -465 +450 @@
                 node = getscreen(screenname);
 
-        debug(1000, "out");
         return sortscreen(node);
 }
@@ -471 +455 @@
 struct skin* getlastscreennode(struct skin* node)
 {
-        debug(1000, "in");
         struct skin *prev = NULL;
 
@@ -482 +465 @@
         }
 
-        debug(1000, "out");
         return prev;
 }
@@ -510 +492 @@
 struct skin* addscreennode(struct skin* node, char* line, struct skin* last)
 {
-//      debug(1000, "in");
         char *ret = NULL;
         struct skin *newnode = NULL, *prev = NULL, *tmpnode = node;
@@ -938 +919 @@
                 createfilelist(tmpnode, newnode, 0);
 
-        //debug(1000, "out");
         return newnode;
 }
@@ -944 +924 @@
 struct skin* addscreennodebyname(char* screenname, char* line)
 {
-        debug(1000, "in");
         struct skin *node = NULL;
 
@@ -952 +931 @@
                 node = getscreen(screenname);
 
-        debug(1000, "out");
         return addscreennode(node, line, NULL);
 }
@@ -960 +938 @@
 int addscreen(char *buf, int del, int flag)
 {
-        debug(1000, "in");
         struct skin* node = NULL, *tmpnode = NULL;
         char* buf1 = buf, *tmpstr = NULL;
@@ -1000 +977 @@
                 }
         }
-        debug(1000, "out");
         return 0;
 }
@@ -1008 +984 @@
 int readscreen(char *filename, int del, int flag)
 {
-        debug(1000, "in");
         char *buf = NULL;
 
@@ -1029 +1004 @@
                 free(buf);
         }
-        debug(1000, "out");
         return 0;
 }
@@ -1035 +1009 @@
 struct skin* checkscreennode(struct skin *node, char* nodename)
 {
-        debug(1000, "in");
-
         if(node != NULL) node = node->child;
 
@@ -1042 +1014 @@
         {
                 if(ostrcmp(node->name, nodename) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
+
                 node = node->next;
         }
@@ -1054 +1024 @@
 struct skin* getscreennode(struct skin *node, char* nodename)
 {
-        debug(1000, "in");
-
         if(node != NULL) node = node->child;
 
@@ -1061 +1029 @@
         {
                 if(ostrcmp(node->name, nodename) == 0)
-                {
-                        debug(1000, "out");
                         return node;
-                }
+
                 node = node->next;
         }
@@ -1074 +1040 @@
 struct skin* getscreennodebyname(char* screenname, char* nodename)
 {
-        debug(1000, "in");
         struct skin *node = NULL;
 
         node = getscreen(screenname);
-
-        debug(1000, "out");
         return getscreennode(node, nodename);
 }
@@ -1085 +1048 @@
 void freenodecontent(struct skin* node)
 {
-        debug(1000, "in");
-
         if(node->pluginhandle != NULL)
                 dlclose(node->pluginhandle);
@@ -1141 +1102 @@
         node->handle1 = NULL;
         node->pluginhandle = NULL;
-
-        debug(1000, "out");
 }
 
 void delmarkedscreennodes(struct skin* node, int mark)
 {
-        debug(1000, "in");
         struct skin *prev = NULL, *screen = node;
         struct skin* sel = NULL, *tmp = NULL;
@@ -1215 +1173 @@
                 node = node->next;
         }
-
-
-        debug(1000, "out");
 }
 
 void delscreennode(struct skin *node, char* nodename)
 {
-        debug(1000, "in");
         struct skin *prev = NULL;
         struct skin **nodeaddr;
 
         if(node == NULL || node == status.skinerr)
-        {
-                debug(1000, "out -> NULL detect");
                 return;
-        }
 
         if(node == skin && node->child == NULL)
@@ -1265 +1216 @@
                 node = NULL;
         }
-
-        debug(1000, "out");
 }
 
@@ -1279 +1228 @@
 
         delscreennode(node, nodename);
-        debug(1000, "out");
 }
 
 void delscreen(struct skin *node)
 {
-        debug(1000, "in");
         struct skin *prev = NULL, *child = NULL;
 
@@ -1300 +1247 @@
         if(node != NULL)
                 delscreennode(skin, node->name);
-
-        debug(1000, "out");
 }
 
 void delscreenbyname(char *screenname)
 {
-        debug(1000, "in");
         struct skin *node = NULL;
         node = getscreen(screenname);
         delscreen(node);
-        debug(1000, "out");
 }
 
 void delmarkedscreen(int del)
 {
-        debug(1000, "in");
         struct skin *node = skin, *prev = skin;
 
@@ -1325 +1267 @@
                         delscreen(prev);
         }
-        debug(1000, "out");
 }
 
 void freescreen()
 {
-        debug(1000, "in");
         struct skin *node = skin, *prev = skin;
 
@@ -1340 +1280 @@
                         delscreen(prev);
         }
-        debug(1000, "out");
 }
 
@@ -1378 +1317 @@
 unsigned char* scale(unsigned char* buf, int width, int height, int channels, int newwidth, int newheight, int free1)
 {
-        debug(1000, "out");
         int h, w, pixel, nmatch;
 
@@ -1415 +1353 @@
 
         if(free1 == 1) free(buf);
-        debug(1000, "out");
         return newbuf;
 }
@@ -1842 +1779 @@
 unsigned char* readpng(const char* filename, unsigned long* width, unsigned long* height, unsigned long* rowbytes, int* channels, int posx, int posy, int mwidth, int mheight, int halign, int valign)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         int ret, bit_depth, color_type;
@@ -1973 +1909 @@
         debug(100, "png width=%ld height=%ld channels=%d rowbytes=%ld", *width, *height, *channels, *rowbytes);
 
-        debug(1000, "out");
         return buf;
 }
@@ -1979 +1914 @@
 void drawpic(const char* filename, int posx, int posy, int scalewidth, int scaleheight, int mwidth, int mheight, int halign, int valign, int transparent, int quality, int add)
 {
-        debug(1000, "in");
         unsigned char *buf = NULL, *scalebuf = NULL;
         int memfd = -1, py = 0, pyh = 0, pxw = 0, diff = 0;
@@ -2143 +2077 @@
                         freebpamem(memfd, buf, width * height * 3);
         }
-        
-        debug(1000, "out");
 }
 
@@ -2287 +2219 @@
 int drawchar(struct font* font, FT_ULong currentchar, int posx, int posy, int mwidth, int height, long color, int transparent, int charspace, int test)
 {
-//      debug(1000, "in");
         int space = 0, y = 0, x = 0, py = 0, pxw = 0, pyh = 0, max = 220, min = 35;
         FT_UInt glyphindex;
@@ -2325 +2256 @@
                 kerning.x = 0;
 
-        if (test == 1 || space == 1)
-        {
-                //debug(1000, "out -> test or space");
+        if(test == 1 || space == 1)
                 return sbit->xadvance + kerning.x + charspace;
-        }
+
         if(posx + sbit->xadvance > mwidth)
-        {
-                //debug(1000, "out -> text to long");
                 return -1;
-        }
 
         if(status.fasttextrender == 1)
@@ -2378 +2304 @@
         }
 
-//      debug(1000, "out");
         return sbit->xadvance + kerning.x + charspace;
 }
@@ -2384 +2309 @@
 void getstringwh(struct font* font, char *string, int *stringwidth, int *stringheight, int charspace)
 {
-        debug(1000, "in");
         FT_ULong cret = 0;
         if(string == NULL) return;
@@ -2394 +2318 @@
                 string++;
         }
-        debug(1000, "out");
 }
 
@@ -2502 +2425 @@
 int drawstring(char* string, unsigned long linecount, unsigned int poscount, unsigned int markpos, int posx, int posy, int mwidth, int mheight, int halign, int valign, char* fontname, int fontsize, long color, int transparent, int wrap, int* lastposx, int* lastposy, int* len, int charspace, int flag)
 {
-        debug(1000, "in");
         int charwidth = 0, lineend = 0;
         int charcount = 0;
@@ -2532 +2454 @@
         if(fontsize < 5)
         {
-                debug(1000, "out -> fontsize to small");
+                err("fontsize to small");
                 if(flag == 1) free(tmpstr);
                 return 1;
@@ -2544 +2466 @@
         if(aktheight > mheight)
         {
-                debug(1000, "out -> to many textlines");
+                err("to many textlines");
                 if(flag == 1) free(tmpstr);
                 return 1;
@@ -2593 +2515 @@
         
         if(flag == 1) free(tmpstr);
-        debug(1000, "out");
         return ret;
 }
@@ -2599 +2520 @@
 char* saverect(int posx, int posy, int width, int height)
 {
-        debug(1000, "in");
         char* buf;
         int y = 0, len = width * skinfb->colbytes, px = posx * skinfb->colbytes;
@@ -2613 +2533 @@
                 memcpy(buf + len * y, skinfb->fb + ((y + posy) * skinfb->pitch) + px, len);
 
-        debug(1000, "out");
         return buf;
 }
@@ -2626 +2545 @@
 void restorerectcheck(char* buf, int posx, int posy, int width, int height, int flag)
 {
-        debug(1000, "in");
         int y = 0, len = width * skinfb->colbytes, px = posx * skinfb->colbytes;
 
@@ -2640 +2558 @@
                 }
         }
-        debug(1000, "out");
 }
 
@@ -2661 +2578 @@
 void lcd_fillrect(int posx, int posy, int width, int height, long color, int transparent)
 {
-        //debug(1000, "in");
         int y, x;
         unsigned long tmpcol;
@@ -2680 +2596 @@
                 for(x = 0; x < width; x++)
                         drawpixel(posx + x, posy + y, tmpcol);
-
-        //debug(1000, "out");
 }
 
 void lcd_drawrect(int posx, int posy, int width, int height, long color, int transparent)
 {
-        //debug(1000, "in");
         fillrect(posx, posy, width, 1, color, transparent);
         fillrect(posx, posy + height - 1, width, 1, color, transparent);
         fillrect(posx, posy, 1, height, color, transparent);
         fillrect(posx + width - 1, posy, 1, height, color, transparent);
-        //debug(1000, "out");
 }
 //*************** GOST LCD
@@ -2877 +2789 @@
 void drawtitlebggradient(struct skin* node)
 {
-        debug(1000, "in");
         if(status.picbordersize > 0)
                 drawgradient(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize * 2), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->titlebgcol2, node->transparent, node->titlegradient);
         else
                 drawgradient(node->rposx, node->rposy, node->rwidth, node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->titlebgcol2, node->transparent, node->titlegradient);
-        debug(1000, "out");
 }
 
 void drawbggradient(struct skin* node)
 {
-        debug(1000, "in");
         drawgradient(node->rposx, node->rposy, node->rwidth, node->rheight, node->bgcol, node->bgcol2, node->transparent, node->gradient);
-        debug(1000, "out");
 }
 
 void drawtitlebgcol(struct skin* node)
 {
-        debug(1000, "in");
         if(status.picbordersize > 0)
                 fillrect(node->rposx + status.picbordersize, node->rposy + status.picbordersize, node->rwidth - (status.picbordersize * 2), node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->transparent);
         else
                 fillrect(node->rposx, node->rposy, node->rwidth, node->rheight - (node->rheight - node->titlesize), node->titlebgcol, node->transparent);
-        debug(1000, "out");
 }
 
 void drawbginnercol(struct skin* node)
 {
-        debug(1000, "in");
         fillrect(node->rposx + node->bordersize, node->rposy + node->bordersize, node->rwidth - node->bordersize * 2, node->rheight - node->bordersize * 2, node->bgcol, node->transparent);
-        debug(1000, "out");
 }
 
 void drawbgcol(struct skin* node)
 {
-        debug(1000, "in");
         fillrect(node->rposx + node->bgspace, node->rposy + node->bgspace, node->rwidth - (node->bgspace * 2), node->rheight - (node->bgspace * 2), node->bgcol, node->transparent);
-        debug(1000, "out");
 }
 
 void drawtitle(struct skin* node)
 {
-        debug(1000, "in");
         if(status.titlelinesize > 0)
                 drawstring(node->title, 1, 0, -1, node->iposx, node->rposy + node->bordersize, node->iwidth, node->titlesize - status.titlelinesize, node->titlealign, MIDDLE, node->font, node->fontsize, node->fontcol, node->transparent, 0, NULL, NULL, NULL, node->charspace, 0);
@@ -2927 +2828 @@
         else if(node->bordersize > 0)
                 fillrect(node->rposx, node->rposy + node->titlesize, node->rwidth, node->bordersize, node->bordercol, node->transparent);
-        debug(1000, "out");
 }
 
 void drawprogressbar(struct skin* node)
 {
-        debug(1000, "in");
         int val = 0;
 
@@ -2938 +2837 @@
         val = ((float)node->iwidth / 100) * node->progresssize;
         fillrect(node->rposx + node->bordersize, node->rposy + node->bordersize, val, node->iheight, node->progresscol, node->transparent);
-        debug(1000, "out");
 }
 
 void drawmultiprogressbar(struct skin* node)
 {
-        debug(1000, "in");
         struct epgrecord* epgrecord = node->epgrecord;
         int val1 = 0, val2 = 0;
@@ -2959 +2856 @@
                 epgrecord = epgrecord->next;
         }
-        debug(1000, "out");
 }
 
@@ -2987 +2883 @@
 void drawpicborder(struct skin* node)
 {
-        debug(1000, "in");
         int borderwidth = status.picbordersize;
         int borderheight = status.picbordersize;
@@ -3016 +2911 @@
         //drawpic("/home/nit/titan/skin/bs_r.png", node->rposx - node->bordersize + node->rwidth, node->rposy + node->bordersize, 0, node->rheight - (node->bordersize * 2), borderwidth, node->rheight - (node->bordersize * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
         drawpic("/home/nit/titan/skin/bs_r.png", node->rposx + node->rwidth - borderwidth, node->rposy + borderheight, 0, node->rheight - (borderheight * 2), borderwidth, node->rheight - (borderheight * 2), LEFT, TOP, node->transparent, node->picquality, node->picmem);
-        debug(1000, "out");
 }
 
 void drawborder(struct skin* node)
 {
-        debug(1000, "in");
         if(node->bordersize == 1 && node->rheight > 2 && node->bordertype == 0)
                 drawrect(node->rposx, node->rposy, node->rwidth, node->rheight, node->bordercol, node->transparent);
@@ -3037 +2930 @@
                         fillrect(node->rposx + node->rwidth - node->bordersize, node->rposy, node->bordersize, node->rheight, node->bordercol, node->transparent);
         }
-        debug(1000, "out");
 }
 
 void drawscrollbar(struct skin* node)
 {
-        debug(1000, "in");
         if(node->bordersize == 0)
                 drawrect(node->rposx + node->rwidth - node->bordersize - node->scrollbarwidth, node->iposy, node->scrollbarwidth, node->iheight, node->bordercol, node->transparent);
@@ -3049 +2940 @@
 
         fillrect(node->rposx + node->rwidth - node->bordersize - node->scrollbarwidth, node->iposy + node->scrollbarpos, node->scrollbarwidth, node->scrollbarheight, node->bordercol, node->transparent);
-        debug(1000, "out");
 }
 
 void clearshadow(struct skin* node)
 {
-        debug(1000, "in");
-
         if(node->shadowsize < 1) return;
         switch(node->shadowpos)
@@ -3076 +2964 @@
                 break;
         }
-        debug(1000, "out");
 }
 
 void drawshadow(struct skin* node)
 {
-        debug(1000, "in");
         switch(node->shadowpos)
         {
@@ -3101 +2987 @@
                 break;
         }
-        debug(1000, "out");
 }
 
@@ -3111 +2996 @@
         int len = 0;
         char* bglt = NULL, *bglb = NULL, *bgrt = NULL, *bgrb = NULL;
-
-        debug(1000, "in");
         
         node->flag = setbit(node->flag, 0);
@@ -3270 +3153 @@
 
         free(bglt); free(bglb); free(bgrt); free(bgrb);
-        debug(1000, "out");
 }
 
 void calcscrollbar(struct skin* node)
 {
-        debug(1000, "in");
-
         node->scrollbarheight = node->iheight;
 
@@ -3298 +3178 @@
                 if(node->scrollbarheight < 1) node->scrollbarheight = 1;
         }
-        debug(1000, "out");
 }
 
@@ -3316 +3195 @@
 int calclistbox(struct skin* node)
 {
-        debug(1000, "in");
         struct skin* child = NULL, *last = NULL, *found = NULL;
         int selcol = 0;
@@ -3532 +3410 @@
         }
         node->poscount = 0;
-        debug(1000, "out");
         return 0;
 }
@@ -3619 +3496 @@
                 if(node->pagecount != parent->aktpage) return 1;
 
-        debug(1000, "in");
         int shadowlx = 0, shadowrx = 0, shadowoy = 0, shadowuy = 0;
         unsigned int linecount = 0, pagecount = 0, poscount = 0;
@@ -3801 +3677 @@
                 //node->transparent = parent->transparent;
 
-        debug(1000, "out");
         return 0;
 }
@@ -3807 +3682 @@
 int clearscreenalways()
 {
-        debug(1000, "in");
         int i, ret = 0;
 
@@ -3818 +3692 @@
         }
 
-        debug(1000, "out");
         return ret;
 }
@@ -3824 +3697 @@
 int drawscreenalways(struct skin* node, int screencalc)
 {
-        debug(1000, "in");
         int i, ret = 0;
 
@@ -3841 +3713 @@
         }
 
-        debug(1000, "out");
         return ret;
 }
@@ -3847 +3718 @@
 int drawscreennode(struct skin *node, char* nodename, int screencalc)
 {
-        debug(1000, "in");
-
         node = getscreennode(node, nodename);
         m_lock(&status.drawingmutex, 0);
@@ -3858 +3727 @@
         m_unlock(&status.drawingmutex, 0);
 
-        debug(1000, "out");
         return 0;
 }
@@ -3864 +3732 @@
 int drawscreennodebyname(char* screenname, char* nodename, int screencalc)
 {
-        debug(1000, "in");
         struct skin *node;
 
@@ -3876 +3743 @@
         m_unlock(&status.drawingmutex, 0);
 
-        debug(1000, "out");
         return 0;
 }
@@ -3891 +3757 @@
 {
         struct fb* merkskinfb = NULL;
-
-        debug(1000, "in");
         int ret;
         struct skin *child = NULL, *parent = NULL, *oldparent = NULL;
@@ -3912 +3776 @@
                 if(flag == 0 || flag == 4)
                         m_unlock(&status.drawingmutex, 0);
-                debug(1000, "out -> setnodeattr ret = 1");
+                err("setnodeattr ret = 1");
                 return 1;
         }
@@ -4070 +3934 @@
         if(flag == 0 || flag == 4)
                 m_unlock(&status.drawingmutex, 0);
-        debug(1000, "out");
         return 0;
 }
@@ -4076 +3939 @@
 int drawscreenbyname(char* screenname, int screencalc, int flag)
 {
-        debug(1000, "in");
         int ret;
         struct skin* node = NULL;
@@ -4088 +3950 @@
 
         ret = drawscreen(node, screencalc, flag);
-        debug(1000, "out");
         return ret;
 }
@@ -4094 +3955 @@
 int changeinput(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4116 +3976 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4123 +3982 @@
 int changetext(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4135 +3993 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4142 +3999 @@
 int changetext2(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4154 +4010 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4162 +4017 @@
 int changename(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4174 +4028 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4181 +4034 @@
 int changepicmem(struct skin* node, char* text, int timeout, int del)
 {
-        debug(1000, "in");
         unsigned long width = 0, height = 0, rowbytes = 0;
         int ret = 1, channels = 0, memfd = -1, length = 0;
@@ -4210 +4062 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4217 +4068 @@
 int changepic(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4230 +4080 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4237 +4086 @@
 int changeselectpic(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4249 +4097 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4256 +4103 @@
 int changetitle(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4274 +4120 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4281 +4126 @@
 int changemask(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4302 +4146 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4309 +4152 @@
 int changeret(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4321 +4163 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4328 +4169 @@
 int changeparent(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4340 +4180 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4347 +4186 @@
 int changefont(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4359 +4197 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4366 +4203 @@
 int changeparam1(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4378 +4214 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4385 +4220 @@
 int changeparam2(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4397 +4231 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;
@@ -4404 +4237 @@
 int changechoiceboxvalue(struct skin* node, char* text)
 {
-        debug(1000, "in");
         int ret = 1;
 
@@ -4416 +4248 @@
                 ret = 0;
         }
-        debug(1000, "out");
 
         return ret;

titan/titan/skinconfig.h

@@ -69 +69 @@
 struct clist* addskinconfigint(char *key, int value)
 {
-        debug(1000, "in");
         char* fileline = NULL;
         struct clist* ret = NULL;
@@ -77 +76 @@
 
         free(fileline);
-        debug(1000, "out");
         return ret;
 }
@@ -83 +81 @@
 int readskinconfig(const char *filename, struct clist** tmpskinconfig)
 {
-        debug(1000, "in");
         FILE *fd = NULL;
         char *fileline = NULL, *pos;
@@ -124 +121 @@
         fclose(fd);
         free(fileline);
-        debug(1000, "out");
         return 0;
 }
@@ -176 +172 @@
 int reloadskinconfig(char *filename)
 {
-        debug(1000, "in");
         int ret = 0;
 
@@ -183 +178 @@
         if(ret != 0)
         {
-                debug(1000, "out -> readskinconfig fail");
+                err("readskinconfig fail");
                 return 1;
         }
 
-        debug(1000, "out");
         return 0;
 }

titan/titan/skinfunc.h

@@ -452 +452 @@
         // type 2 = remainingtime
 
-        debug(1000, "in");
         struct epg* epgnode = NULL;
         struct tm *loctime = NULL;
@@ -461 +460 @@
         if(format == NULL)
         {
-                debug(1000, "out -> NULL detect");
+                err("NULL detect");
                 return NULL;
         }
@@ -508 +507 @@
 
                         free(loctime); loctime = NULL;
-                        debug(1000, "out");
                         return buf1;
                 }
         }
-        debug(1000, "out");
         return NULL;
 }
@@ -698 +695 @@
 char* gettime(struct skin* node, char* format)
 {