Changeset 5847:1394ec14a63d in roaraudio


Ignore:
Timestamp:
01/07/13 13:43:31 (7 years ago)
Author:
phi
Branch:
default
Message:

revert local test changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libroar/basic.c

    r5846 r5847  
    140140 if ( _spawnlp(MODE, daemonimage, daemonimage, "--tcp", "--bind", "localhost", "--port", buf, (const char*)NULL) < 0 ) { 
    141141  roar_err_update(); 
    142   ret = roar_error; 
    143142  ROAR_ERR("_start_server_win32(server='%s', ...): Can not start server: %s: %s", server, daemonimage, roar_errorstring); 
    144   roar_error = ret; 
    145   ROAR_ERR("_start_server_win32(*): %s", roar_errorstring); 
    146   roar_error = ret; 
    147   ROAR_ERR("DUMMY"); 
    148   ROAR_ERR("_start_server_win32(*): %s", roar_errorstring); 
    149   roar_error = ret; 
    150   (void)roar_errorstring; 
    151   ROAR_ERR("_start_server_win32(*): %s", roar_errorstring); 
    152143  return -1; 
    153144 } 
     
    164155   roar_sleep(1); 
    165156 } 
    166  
    167  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring); 
    168157 
    169158 if ( ret == -1 ) 
     
    247236static int _start_server(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) { 
    248237#if defined(ROAR_TARGET_WIN32) 
    249  int ret; 
    250  ret = _start_server_win32(con, server, type, flags, timeout); 
    251  ROAR_ERR("_start_server(*): %s", roar_errorstring); 
    252  return ret; 
     238 return _start_server_win32(con, server, type, flags, timeout); 
    253239#elif !defined(ROAR_TARGET_MICROCONTROLLER) 
    254240 return _start_server_posix(con, server, type, flags, timeout); 
     
    307293  return 0; 
    308294 } else if ( !strcmp(server, "+fork") || !strncmp(server, "+fork=", 6) ) { 
    309   ret = _start_server(con, server, type, flags, timeout); 
    310   ROAR_ERR("_connect_server(*): %s", roar_errorstring); 
    311   return ret; 
     295  return _start_server(con, server, type, flags, timeout); 
    312296 } else if ( !strcmp(server, "+internal") || !strncmp(server, "+internal=", 10) ) { 
    313297  ret = _connect_internal(con, server, type, flags, timeout); 
Note: See TracChangeset for help on using the changeset viewer.