Changeset 5237:9dad2e237a34 in roaraudio
- Timestamp:
- 11/12/11 16:54:06 (12 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/basic.h
r5231 r5237 78 78 79 79 80 int roar_connect_raw (const char * server) _LIBROAR_ATTR_DEPRECATED; 81 int roar_connect_raw2 (const char * server, int flags, uint_least32_t timeout); 80 int roar_connect_raw (const char * server, int flags, uint_least32_t timeout); 82 81 83 int roar_connect (struct roar_connection * con, const char * server) _LIBROAR_ATTR_DEPRECATED; 84 int roar_connect2 (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout); 82 int roar_connect (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout); 85 83 int roar_connect_fh (struct roar_connection * con, int fh); 86 84 int roar_get_connection_fh (struct roar_connection * con); -
libroar/basic.c
r5232 r5237 36 36 #include "libroar.h" 37 37 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) { 38 int roar_connect_raw (const char * server, int flags, uint_least32_t timeout) { 43 39 #ifdef ROAR_HAVE_LIBSLP 44 40 struct roar_libroar_config * config = roar_libroar_get_config(); … … 158 154 ) { 159 155 if ( (server = roar_slp_find_roard(0)) != NULL ) { 160 if ( (fh = roar_connect_raw 2(server, 0, 0)) != -1 )156 if ( (fh = roar_connect_raw(server, 0, 0)) != -1 ) 161 157 return fh; 162 158 163 159 /* in case we can not connect to the server given this may be a cache problem, 164 160 we do a new lookup with the cache disabled in this case */ 165 ROAR_WARN("roar_connect_raw 2(*): Can not connect to SLP located server, disabling cache");161 ROAR_WARN("roar_connect_raw(*): Can not connect to SLP located server, disabling cache"); 166 162 if ( (server = roar_slp_find_roard(1)) != NULL ) 167 if ( (fh = roar_connect_raw 2(server, 0, 0)) != -1 )163 if ( (fh = roar_connect_raw(server, 0, 0)) != -1 ) 168 164 return fh; 169 165 } … … 176 172 if ( list != NULL ) { 177 173 for (i = 0; list[i].server != NULL; i++) { 178 if ( (fh = roar_connect_raw 2((char*)list[i].server, 0, 0)) != -1 ) {174 if ( (fh = roar_connect_raw((char*)list[i].server, 0, 0)) != -1 ) { 179 175 roar_enum_servers_free(list); 180 176 return fh; … … 232 228 user_sock[sizeof(user_sock)-1] = 0; 233 229 #else 234 ROAR_ERR("roar_connect_raw 2(*): size of DECnet object unknown.");235 #endif 236 } 237 ROAR_DBG("roar_connect_raw 2(*): 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); 238 234 } 239 235 … … 247 243 } 248 244 249 ROAR_DBG("roar_connect_raw 2(*) = %i", fh);245 ROAR_DBG("roar_connect_raw(*) = %i", fh); 250 246 251 247 return fh; 252 248 } 253 249 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) { 250 int roar_connect (struct roar_connection * con, const char * server, int flags, uint_least32_t timeout) { 259 251 int fh; 260 252 … … 265 257 266 258 roar_err_set(ROAR_ERROR_UNKNOWN); 267 fh = roar_connect_raw 2(server, flags, timeout);259 fh = roar_connect_raw(server, flags, timeout); 268 260 269 261 if ( fh == -1 ) -
libroar/simple.c
r5226 r5237 44 44 ROAR_DBG("roar_simple_connect(*): trying to connect..."); 45 45 46 if ( roar_connect 2(con, server, flags, timeout) == -1 ) {46 if ( roar_connect(con, server, flags, timeout) == -1 ) { 47 47 ROAR_DBG("roar_simple_connect(*): roar_connect() faild!"); 48 48 return -1;
Note: See TracChangeset
for help on using the changeset viewer.