Changeset 5237:9dad2e237a34 in roaraudio for libroar


Ignore:
Timestamp:
11/12/11 16:54:06 (11 years ago)
Author:
phi
Branch:
default
Phase:
public
Message:

Removed roar_connect_raw() and roar_connect().

Location:
libroar
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libroar/basic.c

    r5232 r5237  
    3636#include "libroar.h" 
    3737 
    38 int roar_connect_raw (const char * server) { 
    39  return roar_connect_raw2(server, 0, 0); 
    40 } 
    41  
    42 int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout) { 
     38int roar_connect_raw (const char * server, int flags, uint_least32_t timeout) { 
    4339#ifdef ROAR_HAVE_LIBSLP 
    4440 struct roar_libroar_config * config = roar_libroar_get_config(); 
     
    158154    ) { 
    159155  if ( (server = roar_slp_find_roard(0)) != NULL ) { 
    160    if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 ) 
     156   if ( (fh = roar_connect_raw(server, 0, 0)) != -1 ) 
    161157    return fh; 
    162158 
    163159   /* in case we can not connect to the server given this may be a cache problem, 
    164160      we do a new lookup with the cache disabled in this case                     */ 
    165    ROAR_WARN("roar_connect_raw2(*): Can not connect to SLP located server, disabling cache"); 
     161   ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache"); 
    166162   if ( (server = roar_slp_find_roard(1)) != NULL ) 
    167     if ( (fh = roar_connect_raw2(server, 0, 0)) != -1 ) 
     163    if ( (fh = roar_connect_raw(server, 0, 0)) != -1 ) 
    168164     return fh; 
    169165  } 
     
    176172 if ( list != NULL ) { 
    177173  for (i = 0; list[i].server != NULL; i++) { 
    178    if ( (fh = roar_connect_raw2((char*)list[i].server, 0, 0)) != -1 ) { 
     174   if ( (fh = roar_connect_raw((char*)list[i].server, 0, 0)) != -1 ) { 
    179175    roar_enum_servers_free(list); 
    180176    return fh; 
     
    232228    user_sock[sizeof(user_sock)-1] = 0; 
    233229#else 
    234     ROAR_ERR("roar_connect_raw2(*): size of DECnet object unknown."); 
    235 #endif 
    236    } 
    237     ROAR_DBG("roar_connect_raw2(*): user_sock='%s'", user_sock); 
     230    ROAR_ERR("roar_connect_raw(*): size of DECnet object unknown."); 
     231#endif 
     232   } 
     233    ROAR_DBG("roar_connect_raw(*): user_sock='%s'", user_sock); 
    238234  } 
    239235 
     
    247243 } 
    248244 
    249  ROAR_DBG("roar_connect_raw2(*) = %i", fh); 
     245 ROAR_DBG("roar_connect_raw(*) = %i", fh); 
    250246 
    251247 return fh; 
    252248} 
    253249 
    254 int roar_connect    (struct roar_connection * con, const char * server) { 
    255  return roar_connect2(con, server, 0, 0); 
    256 } 
    257  
    258 int roar_connect2     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) { 
     250int roar_connect     (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) { 
    259251 int fh; 
    260252 
     
    265257 
    266258 roar_err_set(ROAR_ERROR_UNKNOWN); 
    267  fh = roar_connect_raw2(server, flags, timeout); 
     259 fh = roar_connect_raw(server, flags, timeout); 
    268260 
    269261 if ( fh == -1 ) 
  • libroar/simple.c

    r5226 r5237  
    4444 ROAR_DBG("roar_simple_connect(*): trying to connect..."); 
    4545 
    46  if ( roar_connect2(con, server, flags, timeout) == -1 ) { 
     46 if ( roar_connect(con, server, flags, timeout) == -1 ) { 
    4747  ROAR_DBG("roar_simple_connect(*): roar_connect() faild!"); 
    4848  return -1; 
Note: See TracChangeset for help on using the changeset viewer.