Changeset 4395:fd02b170c292 in roaraudio for roard/clients.c

Timestamp:

09/26/10 18:24:55 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some cleanup

File:

• roard/clients.c (modified) (1 diff)

roard/clients.c

@@ -156 +156 @@
  counters_inc(clients, -1);
 
- if (ROAR_CLIENT(g_clients[id])->execed != -1) {
+ if (ROAR_CLIENT(cs)->execed != -1) {
 //  return streams_delete(g_clients[id]->execed);
-  ROAR_CLIENT(g_clients[id])->execed = -1;
+  ROAR_CLIENT(cs)->execed = -1;
   close_client_fh = 0;
  }
 
  for (i = 0; i < ROAR_CLIENTS_MAX_STREAMS_PER_CLIENT; i++) {
-  streams_delete(ROAR_CLIENT(g_clients[id])->streams[i]);
- }
-
- if ( ROAR_CLIENT(g_clients[id])->fh != -1 && close_client_fh )
-  close(ROAR_CLIENT(g_clients[id])->fh);
-
- roar_nnode_free(&(ROAR_CLIENT(g_clients[id])->nnode));
-
- roar_mm_free(g_clients[id]);
+  streams_delete(ROAR_CLIENT(cs)->streams[i]);
+ }
+
+ if ( ROAR_CLIENT(cs)->fh != -1 && close_client_fh )
+  close(ROAR_CLIENT(cs)->fh);
+
+ roar_nnode_free(&(ROAR_CLIENT(cs)->nnode));
+
+ roar_mm_free(cs);
  g_clients[id] = NULL;