mirror of
				https://github.com/rofafor/vdr-plugin-iptv.git
				synced 2023-10-10 11:37:03 +00:00 
			
		
		
		
	Use c-style function naming for functions outside of classes.
This commit is contained in:
		
							
								
								
									
										4
									
								
								common.c
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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 <vdr/i18n.h>
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								common.h
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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 <sys/wait.h>
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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 <sys/types.h>
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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 <sys/types.h>
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user