summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmirl <schmirl>2007-04-16 11:01:02 +0000
committerschmirl <schmirl>2007-04-16 11:01:02 +0000
commit3ceb716ea9492ba1eb3331882a44b0d733426752 (patch)
treef3e15c1644ea780e3325c7ad8449c157862cc7a1
parent69b754bef9e45c3f92be1e37c177c41a1fcba41c (diff)
downloadvdr-plugin-streamdev-3ceb716ea9492ba1eb3331882a44b0d733426752.tar.gz
vdr-plugin-streamdev-3ceb716ea9492ba1eb3331882a44b0d733426752.tar.bz2
Use compiler flag -Wall. Cleanup code as necessary.
(#171 Thanks to Rolf Ahrenberg) Modified Files: Makefile streamdev-server.c server/connection.h server/connectionHTTP.c server/connectionVTP.c tools/source.c
-rw-r--r--Makefile4
-rw-r--r--server/connection.h6
-rw-r--r--server/connectionHTTP.c6
-rw-r--r--server/connectionVTP.c6
-rw-r--r--streamdev-server.c4
-rw-r--r--tools/source.c2
6 files changed, 13 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 7be2627..8529750 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.7 2006/09/14 10:30:16 schmirl Exp $
+# $Id: Makefile,v 1.8 2007/04/16 11:01:02 schmirl Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -16,7 +16,7 @@ VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }'
### The C++ compiler and options:
CXX ?= g++
-CXXFLAGS ?= -fPIC -W -Woverloaded-virtual
+CXXFLAGS ?= -fPIC -Wall -Woverloaded-virtual
### The directory environment:
diff --git a/server/connection.h b/server/connection.h
index 2df850e..fe828d9 100644
--- a/server/connection.h
+++ b/server/connection.h
@@ -1,5 +1,5 @@
/*
- * $Id: connection.h,v 1.4 2007/04/02 10:32:34 schmirl Exp $
+ * $Id: connection.h,v 1.5 2007/04/16 11:01:02 schmirl Exp $
*/
#ifndef VDR_STREAMDEV_SERVER_CONNECTION_H
@@ -38,8 +38,8 @@ protected:
Only one line at a time may be sent. If there are lines to follow, set
Last to false. Command(NULL) will be called in the next cycle, so you can
post the next line. */
- virtual bool Respond(const char *Message, bool Last = true, ...)
- __attribute__ ((format (printf, 2, 4)));
+ virtual bool Respond(const char *Message, bool Last = true, ...);
+ //__attribute__ ((format (printf, 2, 4)));
public:
/* If you derive, specify a short string such as HTTP for Protocol, which
diff --git a/server/connectionHTTP.c b/server/connectionHTTP.c
index a526da9..5f0beef 100644
--- a/server/connectionHTTP.c
+++ b/server/connectionHTTP.c
@@ -1,5 +1,5 @@
/*
- * $Id: connectionHTTP.c,v 1.10 2006/01/26 19:40:18 lordjaxom Exp $
+ * $Id: connectionHTTP.c,v 1.11 2007/04/16 11:01:02 schmirl Exp $
*/
#include <ctype.h>
@@ -41,6 +41,8 @@ bool cConnectionHTTP::Command(char *Cmd)
}
Dprintf("header\n");
return true;
+ default:
+ break;
}
return false; // ??? shouldn't happen
}
@@ -153,7 +155,7 @@ bool cConnectionHTTP::CmdGET(const std::string &Opts)
{
const char *sp = Opts.c_str(), *ptr = sp, *ep;
const cChannel *chan;
- int apid = 0, pos;
+ int apid = 0;
ptr = skipspace(ptr);
while (*ptr == '/')
diff --git a/server/connectionVTP.c b/server/connectionVTP.c
index 18ea353..514c5a0 100644
--- a/server/connectionVTP.c
+++ b/server/connectionVTP.c
@@ -1,5 +1,5 @@
/*
- * $Id: connectionVTP.c,v 1.8 2007/03/02 15:27:07 schmirl Exp $
+ * $Id: connectionVTP.c,v 1.9 2007/04/16 11:01:02 schmirl Exp $
*/
#include "server/connectionVTP.h"
@@ -153,8 +153,6 @@ cLSTEHandler::~cLSTEHandler()
bool cLSTEHandler::Next(bool &Last)
{
- char *buffer;
-
if (m_Error != NULL) {
Last = true;
cString str(m_Error, true);
@@ -562,8 +560,6 @@ bool cConnectionVTP::Command(char *Cmd)
bool cConnectionVTP::CmdCAPS(char *Opts)
{
- char *buffer;
-
if (strcasecmp(Opts, "TS") == 0) {
m_NoTSPIDS = true;
return Respond(220, "Ignored, capability \"%s\" accepted for "
diff --git a/streamdev-server.c b/streamdev-server.c
index af5f104..1d0c097 100644
--- a/streamdev-server.c
+++ b/streamdev-server.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: streamdev-server.c,v 1.5 2007/02/19 12:08:16 schmirl Exp $
+ * $Id: streamdev-server.c,v 1.6 2007/04/16 11:01:02 schmirl Exp $
*/
#include <getopt.h>
@@ -63,7 +63,7 @@ bool cPluginStreamdevServer::Start(void)
if (!StreamdevHosts.Load(STREAMDEVHOSTSPATH, true, true)) {
esyslog("streamdev-server: error while loading %s", STREAMDEVHOSTSPATH);
- fprintf(stderr, "streamdev-server: error while loading %s\n");
+ fprintf(stderr, "streamdev-server: error while loading %s\n", STREAMDEVHOSTSPATH);
if (access(STREAMDEVHOSTSPATH, F_OK) != 0) {
fprintf(stderr, " Please install streamdevhosts.conf into the path "
"printed above. Without it\n"
diff --git a/tools/source.c b/tools/source.c
index 80625e5..c328d7c 100644
--- a/tools/source.c
+++ b/tools/source.c
@@ -110,7 +110,7 @@ bool cTBSource::SafeWrite(const void *Buffer, size_t Length) {
ssize_t cTBSource::ReadUntil(void *Buffer, size_t Length, const char *Seq,
uint TimeoutMs) {
- int seqlen, ms;
+ int ms;
size_t len;
cTBSelect sel;