From 30409fac2c641fed4e0d1250fd1ac46412e46446 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Sepp=C3=A4l=C3=A4?= Date: Sat, 20 Oct 2007 20:43:22 +0000 Subject: [PATCH] Use c-style function naming for functions outside of classes. --- common.c | 4 ++-- common.h | 4 ++-- protocolext.c | 4 ++-- protocolhttp.c | 8 ++++---- protocoludp.c | 4 ++-- sectionfilter.c | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/common.c b/common.c index 7616cd5..1e64017 100644 --- a/common.c +++ b/common.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: common.c,v 1.4 2007/10/20 20:27:58 ajhseppa Exp $ + * $Id: common.c,v 1.5 2007/10/20 20:43:22 ajhseppa Exp $ */ #include @@ -39,7 +39,7 @@ const char *id_pid(const u_short Pid) return "---"; } -int selectSingleDesc(int descriptor, const int usecs, const bool selectWrite) +int select_single_desc(int descriptor, const int usecs, const bool selectWrite) { // Wait for data struct timeval tv; diff --git a/common.h b/common.h index f03a893..fab134b 100644 --- a/common.h +++ b/common.h @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: common.h,v 1.10 2007/10/20 20:27:59 ajhseppa Exp $ + * $Id: common.h,v 1.11 2007/10/20 20:43:22 ajhseppa Exp $ */ #ifndef __IPTV_COMMON_H @@ -32,7 +32,7 @@ uint16_t ts_pid(const uint8_t *buf); uint8_t payload(const uint8_t *tsp); const char *id_pid(const u_short Pid); -int selectSingleDesc(int descriptor, const int usecs, const bool selectWrite); +int select_single_desc(int descriptor, const int usecs, const bool selectWrite); struct section_filter_table_type { const char *description; diff --git a/protocolext.c b/protocolext.c index cc068af..ce30ae3 100644 --- a/protocolext.c +++ b/protocolext.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: protocolext.c,v 1.13 2007/10/20 20:27:59 ajhseppa Exp $ + * $Id: protocolext.c,v 1.14 2007/10/20 20:43:22 ajhseppa Exp $ */ #include @@ -196,7 +196,7 @@ int cIptvProtocolExt::Read(unsigned char* *BufferAddr) // Set argument point to read buffer *BufferAddr = readBuffer; // Wait for data - int retval = selectSingleDesc(socketDesc, 500000, false); + int retval = select_single_desc(socketDesc, 500000, false); // Check if error if (retval < 0) return retval; diff --git a/protocolhttp.c b/protocolhttp.c index 3528a3d..8ae4eca 100644 --- a/protocolhttp.c +++ b/protocolhttp.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: protocolhttp.c,v 1.14 2007/10/20 20:27:59 ajhseppa Exp $ + * $Id: protocolhttp.c,v 1.15 2007/10/20 20:43:22 ajhseppa Exp $ */ #include @@ -142,7 +142,7 @@ bool cIptvProtocolHttp::Connect(void) } // Select on the socket completion, check if it is writable - int retval = selectSingleDesc(socketDesc, 800000, true); + int retval = select_single_desc(socketDesc, 800000, true); if (retval < 0) return retval; @@ -219,7 +219,7 @@ bool cIptvProtocolHttp::GetHeaderLine(char* dest, unsigned int destLen, while (!newline || !linefeed) { socklen_t addrlen = sizeof(sockAddr); // Wait for data - int retval = selectSingleDesc(socketDesc, 500000, false); + int retval = select_single_desc(socketDesc, 500000, false); // Check if error if (retval < 0) return false; @@ -294,7 +294,7 @@ int cIptvProtocolHttp::Read(unsigned char* *BufferAddr) // Set argument point to read buffer *BufferAddr = readBuffer; // Wait for data - int retval = selectSingleDesc(socketDesc, 500000, false); + int retval = select_single_desc(socketDesc, 500000, false); // Check if error if (retval < 0) return retval; diff --git a/protocoludp.c b/protocoludp.c index 4768a9a..36cfce5 100644 --- a/protocoludp.c +++ b/protocoludp.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: protocoludp.c,v 1.15 2007/10/20 20:27:59 ajhseppa Exp $ + * $Id: protocoludp.c,v 1.16 2007/10/20 20:43:22 ajhseppa Exp $ */ #include @@ -164,7 +164,7 @@ int cIptvProtocolUdp::Read(unsigned char* *BufferAddr) // Set argument point to read buffer *BufferAddr = readBuffer; // Wait for data - int retval = selectSingleDesc(socketDesc, 500000, false); + int retval = select_single_desc(socketDesc, 500000, false); // Check if error if (retval < 0) return retval; diff --git a/sectionfilter.c b/sectionfilter.c index 92d4972..89b964c 100644 --- a/sectionfilter.c +++ b/sectionfilter.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: sectionfilter.c,v 1.12 2007/10/20 20:27:59 ajhseppa Exp $ + * $Id: sectionfilter.c,v 1.13 2007/10/20 20:43:22 ajhseppa Exp $ */ #include "sectionfilter.h" @@ -98,7 +98,7 @@ int cIptvSectionFilter::dmxdev_section_callback(const uint8_t *buffer1, size_t b enum dmx_success success) { // See if there is data in the fifo - int retval = selectSingleDesc(fifoDescriptor, 0, false); + int retval = select_single_desc(fifoDescriptor, 0, false); // There is no data in the fifo, more can be written if (!retval) { #ifdef DEBUG_PRINTF