Changeset 5109:4f9fc788fe91 in roaraudio for libroar/basic.c

Timestamp:

07/28/11 16:32:34 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Started to use compiler attributes (Also see: #130)

File:

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

libroar/basic.c

@@ -157 +157 @@
     ) {
   if ( (server = roar_slp_find_roard(0)) != NULL ) {
-   if ( (fh = roar_connect_raw(server)) != -1 )
+   if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 )
     return fh;
 
    /* in case we can not connect to the server given this may be a cache problem,
       we do a new lookup with the cache disabled in this case                     */
-   ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache");
+   ROAR_WARN("roar_connect_raw2(*): Can not connect to SLP located server, disabling cache");
    if ( (server = roar_slp_find_roard(1)) != NULL )
-    if ( (fh = roar_connect_raw(server)) != -1 )
+    if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 )
      return fh;
   }
@@ -175 +175 @@
  if ( list != NULL ) {
   for (i = 0; list[i].server != NULL; i++) {
-   if ( (fh = roar_connect_raw((char*)list[i].server)) != -1 ) {
+   if ( (fh = roar_connect_raw2((char*)list[i].server, 0, 0)) != -1 ) {
     roar_enum_servers_free(list);
     return fh;
@@ -218 +218 @@
     strncat(user_sock, ROAR_DEFAULT_OBJECT, DN_MAXOBJL+2);
 #else
-    ROAR_ERR("roar_connect_raw(*): size of DECnet object unknown.");
+    ROAR_ERR("roar_connect_raw2(*): size of DECnet object unknown.");
 #endif
    }
@@ -235 +235 @@
   roar_err_set(ROAR_ERROR_CONNREFUSED);
 
- ROAR_DBG("roar_connect_raw(*) = %i", fh);
+ ROAR_DBG("roar_connect_raw2(*) = %i", fh);
 
  return fh;