Changeset 5375:2b4d1e027b2d in roaraudio for libroar/basic.c

Timestamp:

12/22/11 21:16:34 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

made some _LIBROAR_ATTR_TO_STATIC functions static

File:

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

libroar/basic.c

@@ -226 +226 @@
 
  if ( port || is_decnet ) {
-  fh = roar_socket_connect(user_sock, port);
+  fh = roar_socket_connect(type, user_sock, port);
   // restore the original string
   user_sock[i] = ':';
@@ -239 +239 @@
   }
 #endif
-  fh = roar_socket_connect(user_sock, ROAR_DEFAULT_PORT);
+  fh = roar_socket_connect(type, user_sock, ROAR_DEFAULT_PORT);
  }
 
@@ -368 +368 @@
 #endif
 
-  if ( _connect_server(con, "+abstract", -1, flags, timeout) == 0 )
+  if ( _connect_server(con, "+abstract", ROAR_SOCKET_TYPE_UNKNOWN, flags, timeout) == 0 )
    return 0;
 
@@ -377 +377 @@
     ) {
   if ( (server = roar_slp_find_roard(0)) != NULL ) {
-   if ( _connect_server(con, server, -1, 0, 0) == 0 )
+   if ( _connect_server(con, server, ROAR_SOCKET_TYPE_UNKNOWN, 0, 0) == 0 )
     return 0;
 
@@ -384 +384 @@
    ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache");
    if ( (server = roar_slp_find_roard(1)) != NULL )
-    if ( _connect_server(con, server, -1, 0, 0) == 0 )
+    if ( _connect_server(con, server, ROAR_SOCKET_TYPE_UNKNOWN, 0, 0) == 0 )
      return 0;
   }
@@ -395 +395 @@
  if ( list != NULL ) {
   for (i = 0; list[i].server != NULL; i++) {
-   if ( _connect_server(con, list[i].server, -1, 0, 0) == 0 ) {
+   if ( _connect_server(con, list[i].server, ROAR_SOCKET_TYPE_UNKNOWN, 0, 0) == 0 ) {
     roar_enum_servers_free(list);
     return 0;
@@ -408 +408 @@
  } else {
   /* connect via (char*)server */
-  if ( _connect_server(con, server, -1, flags, timeout) != 0 )
+  if ( _connect_server(con, server, ROAR_SOCKET_TYPE_UNKNOWN, flags, timeout) != 0 )
    return -1;
   return 0;