Fix some fallout from last commit

diff --git a/src/rtsp.c b/src/rtsp.c
index 7160cbf20e03871bcbb44970c19489cd5615f042..5806a1ea74e534e3f05484fe376bea800f2275fd 100644 (file)
--- a/src/rtsp.c
+++ b/src/rtsp.c
@@ -465,7 +465,7 @@ rtsp_streaming_input(void *opaque, streaming_message_t *sm)
 
   case SMT_NOSTART:
     pthread_mutex_lock(&rtsp->rtsp_start_mutex);
-    rtsp->rtsp_start_error = transport_nostart2txt(sm->sm_code);
+    rtsp->rtsp_start_error = streaming_code2txt(sm->sm_code);
     pthread_cond_signal(&rtsp->rtsp_start_cond);
     pthread_mutex_unlock(&rtsp->rtsp_start_mutex);
     break;

diff --git a/src/subscriptions.c b/src/subscriptions.c
index 5489741b1e44fbeae0e951c7845a56b9d9719111..efe45c8df7572044e199eab08927db3435c2b956 100644 (file)
--- a/src/subscriptions.c
+++ b/src/subscriptions.c
@@ -358,7 +358,7 @@ subscription_create_from_transport(th_transport_t *t, const char *name,
 
       tvhlog(LOG_INFO, "subscription", 
             "\"%s\" direct subscription failed -- %s", name,
-            transport_nostart2txt(r));
+            streaming_code2txt(r));
       return NULL;
     }
   }

diff --git a/src/transports.c b/src/transports.c
index 3172e928fdb5dacc8ffe7ac2cbb31def25d3ef64..ef43eaa2c98e6ae62508467f86a02a75b66d7d71 100644 (file)
--- a/src/transports.c
+++ b/src/transports.c
@@ -54,18 +54,6 @@ static struct th_transport_list transporthash[TRANSPORT_HASH_WIDTH];
 
 static void transport_data_timeout(void *aux);
 
-/**
- *
- */
-const char *
-transport_nostart2txt(int code)
-{
-  switch(code) {
-  }
-  return "Unknown error";
-}
-
-
 /**
  *
  */
@@ -432,7 +420,7 @@ transport_find(channel_t *ch, unsigned int weight, const char *loginfo,
     if((r = transport_start(t, 0, 0)) == 0)
       return t;
     tvhlog(LOG_DEBUG, "Transport", "%s: Unable to use \"%s\" -- %s",
-            loginfo, transport_nicename(t), transport_nostart2txt(r));
+            loginfo, transport_nicename(t), streaming_code2txt(r));
   }
 
   /* Ok, nothing, try again, but supply our weight and thus, try to steal
@@ -446,7 +434,7 @@ transport_find(channel_t *ch, unsigned int weight, const char *loginfo,
     if(loginfo != NULL)
       tvhlog(LOG_NOTICE, "Transport", 
             "%s: Skipping \"%s\" -- %s",
-            loginfo, transport_nicename(t), transport_nostart2txt(r));
+            loginfo, transport_nicename(t), streaming_code2txt(r));
   }
   if(errorp != NULL)
     *errorp = error;

diff --git a/src/transports.h b/src/transports.h
index 366549eb183fd010eb4055a08759ec103c36e6fe..254c4aefa522dbe69facb7c205881174e0fb261d 100644 (file)
--- a/src/transports.h
+++ b/src/transports.h
@@ -99,8 +99,6 @@ const char *transport_nicename(th_transport_t *t);
 
 const char *transport_component_nicename(th_stream_t *st);
 
-const char *transport_nostart2txt(int code);
-
 const char *transport_tss2text(int flags);
 
 static inline int transport_tss_is_error(int flags)