Changeset 5185:9c42709e2c89 in roaraudio
- Timestamp:
- 10/22/11 19:34:28 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
libroar/basic.c
r5148 r5185 190 190 /* connect via (char*)server */ 191 191 // find a port: 192 193 if ( !strcmp(server, "+invalid") ) { 194 roar_err_set(ROAR_ERROR_CANCELED); 195 return -1; 196 } 192 197 193 198 strncpy(user_sock, server, sizeof(user_sock)-1); … … 242 247 } 243 248 244 if ( fh == -1 )245 roar_err_set(ROAR_ERROR_CONNREFUSED);246 247 249 ROAR_DBG("roar_connect_raw2(*) = %i", fh); 248 250 -
roarclients/roarctl.c
r5149 r5185 252 252 253 253 if ( roar_get_time(con, &time) == -1 ) { 254 fprintf(stderr, "Error: can not get server time: %s\n", roar_ error2str(roar_error));254 fprintf(stderr, "Error: can not get server time: %s\n", roar_vs_strerr(roar_error)); 255 255 return; 256 256 } … … 1114 1114 1115 1115 if ( roar_simple_connect(&con, server, "roarctl") == -1 ) { 1116 fprintf(stderr, "Error: Can not connect to server\n"); 1116 fprintf(stderr, "Error: Can not connect to server: %s: %s(%i)\n", 1117 server == NULL ? "(default)" : server, roar_vs_strerr(roar_error), roar_error); 1117 1118 return 1; 1118 1119 } -
roarclients/roarinterconnect.c
r5179 r5185 297 297 } 298 298 299 if ( server != NULL && !strcmp(server, "+invalid") ) { 300 return 0; 301 } 302 299 303 switch (type & MT_MASK) { 300 304 case MT_ROAR: -
tests/test-runnable.sh
r3893 r5185 12 12 printf "%-16s : " "$c" 13 13 14 $EXEC_HELPER $BIN_PATH$c --server '(INVALID)'< /dev/null > /dev/null 2> /dev/null14 $EXEC_HELPER $BIN_PATH$c --server +invalid < /dev/null > /dev/null 2> /dev/null 15 15 R=$? 16 16
Note: See TracChangeset
for help on using the changeset viewer.