From 9dfe20d357e92668159c6a002db0c493b4a18942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96man?= <andreas@lonelycoder.com>
Date: Sat, 29 Sep 2007 16:01:13 +0000
Subject: [PATCH] client_t is only used in htsclient.c, move the struct there

---
 htsclient.c | 35 +++++++++++++++++++++++++++++++++++
 htsclient.h |  2 --
 tvhead.h    | 33 ---------------------------------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/htsclient.c b/htsclient.c
index 9d5b0361..b9946d3a 100644
--- a/htsclient.c
+++ b/htsclient.c
@@ -38,9 +38,44 @@
 #include "dvb.h"
 #include "strtab.h"
 
+LIST_HEAD(client_list, client);
+
 struct client_list all_clients;
 
 
+/*
+ * Client
+ */
+
+typedef struct client {
+
+  LIST_ENTRY(client) c_global_link;
+  int c_fd;
+  int c_streamfd;
+  pthread_t c_ptid;
+  
+  LIST_HEAD(, th_subscription) c_subscriptions;
+
+  struct in_addr c_ipaddr;
+  int c_port;
+
+  struct ref_update_queue c_refq;
+
+  int c_pkt_maxsiz;
+
+  char c_input_buf[100];
+  int c_input_buf_ptr;
+
+  char *c_title;
+
+  void *c_dispatch_handle;
+
+  void *c_status_timer;
+
+} client_t;
+
+
+
 static void client_status_update(void *aux);
 
 static void
diff --git a/htsclient.h b/htsclient.h
index f657d9c1..593950be 100644
--- a/htsclient.h
+++ b/htsclient.h
@@ -21,8 +21,6 @@
 
 void client_start(void);
 
-void client_unsubscribe(client_t *c);
-
 void clients_send_ref(int ref);
 
 void client_status_update(void);
diff --git a/tvhead.h b/tvhead.h
index 1deeaaa4..c05b450e 100644
--- a/tvhead.h
+++ b/tvhead.h
@@ -34,7 +34,6 @@ LIST_HEAD(th_subscription_list, th_subscription);
 TAILQ_HEAD(th_channel_queue, th_channel);
 LIST_HEAD(th_dvb_adapter_list, th_dvb_adapter);
 LIST_HEAD(th_v4l_adapter_list, th_v4l_adapter);
-LIST_HEAD(client_list, client);
 LIST_HEAD(event_list, event);
 TAILQ_HEAD(event_queue, event);
 LIST_HEAD(pvr_rec_list, pvr_rec);
@@ -424,38 +423,6 @@ typedef struct th_subscription {
 } th_subscription_t;
 
 
-/*
- * Client
- */
-
-typedef struct client {
-
-  LIST_ENTRY(client) c_global_link;
-  int c_fd;
-  int c_streamfd;
-  pthread_t c_ptid;
-  
-  LIST_HEAD(, th_subscription) c_subscriptions;
-
-  struct in_addr c_ipaddr;
-  int c_port;
-
-  struct ref_update_queue c_refq;
-
-  int c_pkt_maxsiz;
-
-  char c_input_buf[100];
-  int c_input_buf_ptr;
-
-  char *c_title;
-
-  void *c_dispatch_handle;
-
-  void *c_status_timer;
-
-} client_t;
-
-
 
 /*
  * EPG event