Changeset 5005:2f39a39bc5c6 in roaraudio for roarclients/roarctl.c
- Timestamp:
- 05/24/11 20:45:52 (13 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
roarclients/roarctl.c
r4935 r5005 372 372 printf("Client name : %s\n", c.name); 373 373 if ( roar_nnode_get_socktype(&(c.nnode)) != ROAR_SOCKET_TYPE_UNKNOWN ) { 374 if ( roar_nnode_to_str(&(c.nnode), tmp, 80) == 0 ) {374 if ( roar_nnode_to_str(&(c.nnode), tmp, sizeof(tmp)) == 0 ) { 375 375 printf("Client network node : %s\n", tmp); 376 376 } … … 404 404 if ( g_verbose && c.byteorder != ROAR_BYTEORDER_UNKNOWN ) { 405 405 if ( c.byteorder == ROAR_BYTEORDER_NETWORK ) { 406 strcpy(tmp, " (network byteorder");406 roar_mm_strscpy(tmp, " (network byteorder"); 407 407 } else { 408 408 *tmp = 0; … … 411 411 if ( c.byteorder == ROAR_BYTEORDER_NATIVE ) { 412 412 if ( *tmp ) { 413 strcat(tmp, ", native");414 } else { 415 strcpy(tmp, " (native");413 roar_mm_strscat(tmp, ", native"); 414 } else { 415 roar_mm_strscpy(tmp, " (native"); 416 416 } 417 417 } 418 418 419 419 if ( *tmp ) 420 strcat(tmp, ")");420 roar_mm_strscat(tmp, ")"); 421 421 422 422 printf("Client Byteorder : %s%s\n", roar_byteorder2str(c.byteorder), tmp); … … 464 464 printf("Stream direction : %s\n", roar_dir2str(s.dir)); 465 465 466 if ( roar_stream_get_name(con, &s, name, 1024) == 0 )466 if ( roar_stream_get_name(con, &s, name, sizeof(buffer)) == 0 ) 467 467 printf("Stream name : %s\n", name); 468 468 … … 536 536 537 537 *flags = 0; 538 #define _strcat(dst,src) roar_mm_strlcat((dst),(src), sizeof(buffer)) 538 539 if ( info.flags & ROAR_FLAG_PRIMARY ) 539 strcat(flags, "primary ");540 _strcat(flags, "primary "); 540 541 if ( info.flags & ROAR_FLAG_SYNC ) 541 strcat(flags, "sync ");542 _strcat(flags, "sync "); 542 543 if ( info.flags & ROAR_FLAG_OUTPUT ) 543 strcat(flags, "output ");544 _strcat(flags, "output "); 544 545 if ( info.flags & ROAR_FLAG_SOURCE ) 545 strcat(flags, "source ");546 _strcat(flags, "source "); 546 547 if ( info.flags & ROAR_FLAG_META ) 547 strcat(flags, "meta ");548 _strcat(flags, "meta "); 548 549 if ( info.flags & ROAR_FLAG_AUTOCONF ) 549 strcat(flags, "autoconf ");550 _strcat(flags, "autoconf "); 550 551 if ( info.flags & ROAR_FLAG_CLEANMETA ) 551 strcat(flags, "cleanmeta ");552 _strcat(flags, "cleanmeta "); 552 553 if ( info.flags & ROAR_FLAG_HWMIXER ) 553 strcat(flags, "hwmixer ");554 _strcat(flags, "hwmixer "); 554 555 if ( info.flags & ROAR_FLAG_PAUSE ) 555 strcat(flags, "pause ");556 _strcat(flags, "pause "); 556 557 if ( info.flags & ROAR_FLAG_MUTE ) 557 strcat(flags, "mute ");558 _strcat(flags, "mute "); 558 559 if ( info.flags & ROAR_FLAG_MMAP ) 559 strcat(flags, "mmap ");560 _strcat(flags, "mmap "); 560 561 if ( info.flags & ROAR_FLAG_ANTIECHO ) 561 strcat(flags, "antiecho ");562 _strcat(flags, "antiecho "); 562 563 if ( info.flags & ROAR_FLAG_VIRTUAL ) 563 strcat(flags, "virtual ");564 _strcat(flags, "virtual "); 564 565 if ( info.flags & ROAR_FLAG_RECSOURCE ) 565 strcat(flags, "recsource ");566 _strcat(flags, "recsource "); 566 567 if ( info.flags & ROAR_FLAG_PASSMIXER ) 567 strcat(flags, "passmixer ");568 _strcat(flags, "passmixer "); 568 569 if ( info.flags & ROAR_FLAG_PRETHRU ) 569 strcat(flags, "prethru ");570 _strcat(flags, "prethru "); 570 571 if ( info.flags & ROAR_FLAG_IMMUTABLE ) 571 strcat(flags, "immutable ");572 _strcat(flags, "immutable "); 572 573 if ( info.flags & ROAR_FLAG_ENHANCE ) 573 strcat(flags, "enhance ");574 _strcat(flags, "enhance "); 574 575 if ( info.flags & ROAR_FLAG_SINGLESINK ) 575 strcat(flags, "singlesink "); 576 _strcat(flags, "singlesink "); 577 #undef _strcat 576 578 577 579 printf("Flags : %s\n", flags);
Note: See TracChangeset
for help on using the changeset viewer.