Changeset 5847:1394ec14a63d in roaraudio

Timestamp:

01/07/13 13:43:31 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

revert local test changes

File:

• libroar/basic.c (modified) (4 diffs)

libroar/basic.c

@@ -140 +140 @@
  if ( _spawnlp(MODE, daemonimage, daemonimage, "--tcp", "--bind", "localhost", "--port", buf, (const char*)NULL) < 0 ) {
   roar_err_update();
-  ret = roar_error;
   ROAR_ERR("_start_server_win32(server='%s', ...): Can not start server: %s: %s", server, daemonimage, roar_errorstring);
-  roar_error = ret;
-  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
-  roar_error = ret;
-  ROAR_ERR("DUMMY");
-  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
-  roar_error = ret;
-  (void)roar_errorstring;
-  ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
   return -1;
  }
@@ -164 +155 @@
    roar_sleep(1);
  }
-
- ROAR_ERR("_start_server_win32(*): %s", roar_errorstring);
 
  if ( ret == -1 )
@@ -247 +236 @@
 static int _start_server(struct roar_connection * con, const char * server, int type, int flags, uint_least32_t timeout) {
 #if defined(ROAR_TARGET_WIN32)
- int ret;
- ret = _start_server_win32(con, server, type, flags, timeout);
- ROAR_ERR("_start_server(*): %s", roar_errorstring);
- return ret;
+ return _start_server_win32(con, server, type, flags, timeout);
 #elif !defined(ROAR_TARGET_MICROCONTROLLER)
  return _start_server_posix(con, server, type, flags, timeout);
@@ -307 +293 @@
   return 0;
  } else if ( !strcmp(server, "+fork") || !strncmp(server, "+fork=", 6) ) {
-  ret = _start_server(con, server, type, flags, timeout);
-  ROAR_ERR("_connect_server(*): %s", roar_errorstring);
-  return ret;
+  return _start_server(con, server, type, flags, timeout);
  } else if ( !strcmp(server, "+internal") || !strncmp(server, "+internal=", 10) ) {
   ret = _connect_internal(con, server, type, flags, timeout);