diff options
Diffstat (limited to 'xine_frontend_main.c')
| -rw-r--r-- | xine_frontend_main.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/xine_frontend_main.c b/xine_frontend_main.c index 0fd424fd..b31ed9d8 100644 --- a/xine_frontend_main.c +++ b/xine_frontend_main.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend_main.c,v 1.40.2.7 2009-02-12 12:53:29 phintuka Exp $ + * $Id: xine_frontend_main.c,v 1.40.2.5 2008-10-21 15:10:02 phintuka Exp $ * */ @@ -140,8 +140,8 @@ static void *kbd_receiver_thread(void *fe) terminate_key_pressed = 0; - if (system("setterm -cursor off") == -1) ; - if (system("setterm -blank off") == -1) ; + system("setterm -cursor off"); + system("setterm -blank off"); /* Set stdin to deliver keypresses without buffering whole lines */ tcgetattr(STDIN_FILENO, &saved_tm); @@ -190,7 +190,7 @@ static void *kbd_receiver_thread(void *fe) alarm(0); LOGDBG("Keyboard thread terminated"); tcsetattr(STDIN_FILENO, TCSANOW, &saved_tm); - if (system("setterm -cursor on") == -1) ; + system("setterm -cursor on"); pthread_exit(NULL); return NULL; /* never reached */ @@ -255,7 +255,7 @@ static void kbd_stop(void) pthread_join (kbd_thread, &p); tcsetattr(STDIN_FILENO, TCSANOW, &saved_tm); - if (system("setterm -cursor on") == -1) ; + system("setterm -cursor on"); } static void SignalHandler(int signum) @@ -529,7 +529,7 @@ int main(int argc, char *argv[]) !strncmp(mrl, "xvdr:udp:", 9) || !strncmp(mrl, "xvdr:rtp:", 9) || !strncmp(mrl, "xvdr:pipe:", 10))) - mrl[4] = '+'; + mrl[5] = '+'; #endif /* If server address not given, try to find server automatically */ @@ -547,12 +547,10 @@ int main(int argc, char *argv[]) if(mrl) { char *tmp = mrl; mrl = NULL; - if (asprintf(&mrl, "%s//%s:%d", tmp, address, port) < 0) - mrl = NULL; + asprintf(&mrl, "%s//%s:%d", tmp, address, port); free(tmp); } else - if (asprintf(&mrl, "xvdr://%s:%d", address, port) < 0) - mrl = NULL; + asprintf(&mrl, "xvdr://%s:%d", address, port); } else { PRINTF("---------------------------------------------------------------\n" "WARNING: MRL not given and server not found from local network.\n" @@ -565,8 +563,8 @@ int main(int argc, char *argv[]) if(mrl && strncmp(mrl, "xvdr:", 5) && strncmp(mrl, "xvdr+", 5)) { char *mrl2 = mrl; PRINTF("WARNING: MRL does not start with \'xvdr:\' (%s)", mrl); - if (asprintf(&mrl, "xvdr://%s", mrl) >= 0) - free(mrl2); + asprintf(&mrl, "xvdr://%s", mrl); + free(mrl2); } { |