Changeset 5005:2f39a39bc5c6 in roaraudio

Timestamp:

05/24/11 20:45:52 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

replace unsave str{cat,cpy}()

File:

• roarclients/roarctl.c (modified) (5 diffs)

roarclients/roarctl.c

@@ -372 +372 @@
   printf("Client name           : %s\n", c.name);
   if ( roar_nnode_get_socktype(&(c.nnode)) != ROAR_SOCKET_TYPE_UNKNOWN ) {
-  if ( roar_nnode_to_str(&(c.nnode), tmp, 80) == 0 ) {
+  if ( roar_nnode_to_str(&(c.nnode), tmp, sizeof(tmp)) == 0 ) {
    printf("Client network node   : %s\n", tmp);
   }
@@ -404 +404 @@
  if ( g_verbose && c.byteorder != ROAR_BYTEORDER_UNKNOWN ) {
   if ( c.byteorder == ROAR_BYTEORDER_NETWORK ) {
-   strcpy(tmp, " (network byteorder");
+   roar_mm_strscpy(tmp, " (network byteorder");
   } else {
    *tmp = 0;
@@ -411 +411 @@
   if ( c.byteorder == ROAR_BYTEORDER_NATIVE ) {
    if ( *tmp ) {
-    strcat(tmp, ", native");
-   } else {
-    strcpy(tmp, " (native");
+    roar_mm_strscat(tmp, ", native");
+   } else {
+    roar_mm_strscpy(tmp, " (native");
    }
   }
 
   if ( *tmp )
-   strcat(tmp, ")");
+   roar_mm_strscat(tmp, ")");
 
   printf("Client Byteorder      : %s%s\n", roar_byteorder2str(c.byteorder), tmp);
@@ -464 +464 @@
  printf("Stream direction      : %s\n", roar_dir2str(s.dir));
 
- if ( roar_stream_get_name(con, &s, name, 1024) == 0 )
+ if ( roar_stream_get_name(con, &s, name, sizeof(buffer)) == 0 )
   printf("Stream name           : %s\n", name);
 
@@ -536 +536 @@
 
    *flags = 0;
+#define _strcat(dst,src) roar_mm_strlcat((dst),(src), sizeof(buffer))
    if ( info.flags & ROAR_FLAG_PRIMARY )
-    strcat(flags, "primary ");
+    _strcat(flags, "primary ");
    if ( info.flags & ROAR_FLAG_SYNC )
-    strcat(flags, "sync ");
+    _strcat(flags, "sync ");
    if ( info.flags & ROAR_FLAG_OUTPUT )
-    strcat(flags, "output ");
+    _strcat(flags, "output ");
    if ( info.flags & ROAR_FLAG_SOURCE )
-    strcat(flags, "source ");
+    _strcat(flags, "source ");
    if ( info.flags & ROAR_FLAG_META )
-    strcat(flags, "meta ");
+    _strcat(flags, "meta ");
    if ( info.flags & ROAR_FLAG_AUTOCONF )
-    strcat(flags, "autoconf ");
+    _strcat(flags, "autoconf ");
    if ( info.flags & ROAR_FLAG_CLEANMETA )
-    strcat(flags, "cleanmeta ");
+    _strcat(flags, "cleanmeta ");
    if ( info.flags & ROAR_FLAG_HWMIXER )
-    strcat(flags, "hwmixer ");
+    _strcat(flags, "hwmixer ");
    if ( info.flags & ROAR_FLAG_PAUSE )
-    strcat(flags, "pause ");
+    _strcat(flags, "pause ");
    if ( info.flags & ROAR_FLAG_MUTE )
-    strcat(flags, "mute ");
+    _strcat(flags, "mute ");
    if ( info.flags & ROAR_FLAG_MMAP )
-    strcat(flags, "mmap ");
+    _strcat(flags, "mmap ");
    if ( info.flags & ROAR_FLAG_ANTIECHO )
-    strcat(flags, "antiecho ");
+    _strcat(flags, "antiecho ");
    if ( info.flags & ROAR_FLAG_VIRTUAL )
-    strcat(flags, "virtual ");
+    _strcat(flags, "virtual ");
    if ( info.flags & ROAR_FLAG_RECSOURCE )
-    strcat(flags, "recsource ");
+    _strcat(flags, "recsource ");
    if ( info.flags & ROAR_FLAG_PASSMIXER )
-    strcat(flags, "passmixer ");
+    _strcat(flags, "passmixer ");
    if ( info.flags & ROAR_FLAG_PRETHRU )
-    strcat(flags, "prethru ");
+    _strcat(flags, "prethru ");
    if ( info.flags & ROAR_FLAG_IMMUTABLE )
-    strcat(flags, "immutable ");
+    _strcat(flags, "immutable ");
    if ( info.flags & ROAR_FLAG_ENHANCE )
-    strcat(flags, "enhance ");
+    _strcat(flags, "enhance ");
    if ( info.flags & ROAR_FLAG_SINGLESINK )
-    strcat(flags, "singlesink ");
+    _strcat(flags, "singlesink ");
+#undef _strcat
 
    printf("Flags                 : %s\n", flags);