tuxbox-cvs-commits Mailing List for Tuxbox-Project (Page 5)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Project "Tuxbox-GIT: hostapps":

The branch, master has been updated
       via  ad6ca43eadc6188a0532da68f2f80167b18ab7ac (commit)
      from  77656a9b52f47afaa92c85284921e982f47ee4af (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ad6ca43eadc6188a0532da68f2f80167b18ab7ac
Author: GetAway <get...@t-...>
Date:   Thu Feb 12 20:08:48 2015 +0100

    fix for newer gcc
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/ggrab/cbuffer.h b/ggrab/cbuffer.h
index 0c910fe..a0d3fc3 100644
--- a/ggrab/cbuffer.h
+++ b/ggrab/cbuffer.h
@@ -1,5 +1,5 @@
 typedef long long CBUFPTR;
-extern void errexit(char *);
+extern void errexit(const char *);
 extern int gpadding;
 
 
diff --git a/ggrab/ggrab.cpp b/ggrab/ggrab.cpp
index 22a67e7..d32ec47 100644
--- a/ggrab/ggrab.cpp
+++ b/ggrab/ggrab.cpp
@@ -46,15 +46,15 @@ bool	g_realtime = true;
 // Default parameters
 bool	 gnosectionsd	 = false;
 
-int 	toggle_sectionsd(char * p_name);
+int 	toggle_sectionsd(const char * p_name);
 void  *	readkeyboard (void * p_arg);
 void 	install_signal_handler (void) ;
 void 	sighandler (int num);
-void 	generate_program_stream (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, 
+void 	generate_program_stream (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase,
 		bool logging, bool debug, long long max_file_size, bool quiet, int duration);
-void    generate_nomux_streams (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, 
+void    generate_nomux_streams (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase,
 		bool logging, bool debug, long long max_file_size, bool quiet, int duration);
-void    generate_raw_audio (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, 
+void    generate_raw_audio (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase,
 		bool logging, bool debug, long long max_file_size, bool quiet, int duration);
 
 int main( int argc, char *argv[] ) {
@@ -71,7 +71,7 @@ int main( int argc, char *argv[] ) {
 	bool		debug		= false;
 
 	//some default parameters for arguments
-	char  * 	dbox2name 	= "dbox";
+	const char  * 	dbox2name 	= "dbox";
 	time_t 		duration	= 24 * 3600;
 	long long 	max_file_size   = 2LL * 1024 * 1024 * 1024 - 1;
 	enum {MPEG_PP, MPEG_PES, MPEG_RAW} rectype = MPEG_PP;
@@ -295,7 +295,7 @@ void  * readkeyboard (void * p_arg) {
 	}
 }
 
-int toggle_sectionsd(char * p_name) {
+int toggle_sectionsd(const char * p_name) {
 
 	static bool	sectionsd_stopped = false;
 	int	r;
@@ -341,7 +341,8 @@ int toggle_sectionsd(char * p_name) {
 		sprintf(buffer, "GET /control/zapto?stopsectionsd HTTP/1.0\r\n\r\n");
 		sectionsd_stopped=true;
 	}
-	write(sock, buffer, strlen(buffer));
+	if (write(sock, buffer, strlen(buffer)) == -1)
+		perror("error write");
 
 	sleep(1);
 	r=read(sock, buffer, 100);
@@ -349,7 +350,7 @@ int toggle_sectionsd(char * p_name) {
 	return (0);
 }
 
-void generate_program_stream (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, 
+void generate_program_stream (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase,
 			bool logging, bool debug, long long max_file_size, bool quiet, int duration) {
 
 	static unsigned char a_sheader[12 + 10 * 3] = { 
@@ -513,7 +514,7 @@ void generate_program_stream (int a_pid[], int anz_pids, char * p_boxname, int p
 	}
 }
 	
-void generate_nomux_streams (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, bool logging, bool debug, long long max_file_size, bool quiet, int duration) {
+void generate_nomux_streams (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase, bool logging, bool debug, long long max_file_size, bool quiet, int duration) {
 
 	class pesstream * 	p_st[10];
 	char * 			p_basename[10];
@@ -606,7 +607,7 @@ void generate_nomux_streams (int a_pid[], int anz_pids, char * p_boxname, int po
 	}
 }
 
-void generate_raw_audio (int a_pid[], int anz_pids, char * p_boxname, int port, int udpbase, bool logging, bool debug, long long max_file_size, bool quiet, int duration) {
+void generate_raw_audio (int a_pid[], int anz_pids, const char * p_boxname, int port, int udpbase, bool logging, bool debug, long long max_file_size, bool quiet, int duration) {
 
 	class pesstream * 	p_st[10];
 	char * 			p_basename[10];
diff --git a/ggrab/pesstream.cpp b/ggrab/pesstream.cpp
index 01094d6..e6db271 100644
--- a/ggrab/pesstream.cpp
+++ b/ggrab/pesstream.cpp
@@ -21,7 +21,7 @@
 #include "pesstream.h"
 
 
-pesstream::pesstream (S_TYPE stype, char * p_boxname, int pid, int port, int udpport, bool logging, bool debug, bool realtime) {
+pesstream::pesstream (S_TYPE stype, const char * p_boxname, int pid, int port, int udpport, bool logging, bool debug, bool realtime) {
 
 	static struct 	timezone tz;
 	int 		bufsiz;
@@ -570,7 +570,7 @@ void pesstream::get_pp_stats (char * p_buffer, int len) {
 	
 int pesstream::m_st_nr;
 		
-int openStream(char * name, int port, int pid, int udpport, int * udpsocket) {
+int openStream(const char * name, int port, int pid, int udpport, int * udpsocket) {
 
 	struct hostent * hp = gethostbyname(name);
 		
@@ -613,7 +613,8 @@ int openStream(char * name, int port, int pid, int udpport, int * udpsocket) {
 		sprintf(buffer, "GET /%x HTTP/1.0\r\n\r\n", pid);
 	}
 	
-	write(sock, buffer, strlen(buffer));
+	if (write(sock, buffer, strlen(buffer)) == -1)
+		perror("error write");
 
 	return sock;
 }
@@ -645,7 +646,8 @@ void  * readstream (class pesstream & ss) {
 		}	
 */
 #ifndef __CYGWIN__
-		nice(-10);
+		if (nice(-10) == -1);
+			perror("error changing nice value");
 #endif
 	}
 	if (ss.m_log) {
diff --git a/ggrab/pesstream.h b/ggrab/pesstream.h
index 9132861..6133d94 100644
--- a/ggrab/pesstream.h
+++ b/ggrab/pesstream.h
@@ -1,12 +1,12 @@
 
-int 	openStream(char * name, int port, int pid, int udpport, int * udpsocket);
+int 	openStream(const char * name, int port, int pid, int udpport, int * udpsocket);
 void  * readstream (class pesstream & ss);
 
 
 class pesstream {
 
 	public:
-		pesstream (S_TYPE stype, char * p_boxname, int pid, int port, int udpport, bool log, bool debug, bool realtime);
+		pesstream (S_TYPE stype, const char * p_boxname, int pid, int port, int udpport, bool log, bool debug, bool realtime);
 		~pesstream(void);
 		int get_sid (void);
 		void set_sid (int sid);
diff --git a/ggrab/sserver.cpp b/ggrab/sserver.cpp
index d2816f8..f605171 100644
--- a/ggrab/sserver.cpp
+++ b/ggrab/sserver.cpp
@@ -60,14 +60,14 @@ int main(int argc, char * argv[])
 	socklen_t clilen = sizeof(cliaddr);
 
 	a_arg[0] = a_grabname;
-	a_arg[1] = "-p";
+	a_arg[1] = (char *)"-p";
 	a_arg[2] = a_vpid;
 	a_arg[3] = a_apid;
-	a_arg[4] = "-o";
+	a_arg[4] = (char *)"-o";
 	a_arg[5] = a_filename;
-	a_arg[6] = "-host";
+	a_arg[6] = (char *)"-host";
 	a_arg[7] = a_host;
-	a_arg[8] = "-nos";
+	a_arg[8] = (char *)"-nos";
 
 	strcpy (a_grabname,argv[0]);
 	if (strrchr(a_grabname,'/')){
@@ -256,7 +256,7 @@ int main(int argc, char * argv[])
 
 
 /* Shameless stolen from TuxVision */
-char* ParseForString(char *szStr, char *szSearch, int ptrToEnd)
+char* ParseForString(char *szStr, const char *szSearch, int ptrToEnd)
 {
     char *p=NULL;
     p=strstr(szStr, szSearch);
diff --git a/ggrab/tools.cpp b/ggrab/tools.cpp
index 79c19a9..5d980b0 100644
--- a/ggrab/tools.cpp
+++ b/ggrab/tools.cpp
@@ -111,7 +111,7 @@ fill_pp_scr (unsigned char * p_pp, double scr) {
 	p_pp[9] = 0x01;       
 }
 
-void errexit (char * str) {
+void errexit (const char * str) {
 	fprintf (stderr,"%s\n",str);
 	if (gcore) {
 		*((char *)0) = 0;
@@ -119,7 +119,7 @@ void errexit (char * str) {
 	exit (1);
 }
 
-FILE * open_next_output_file (FILE * fp,char * p_basename, char * p_ext, int & seq) {
+FILE * open_next_output_file (FILE * fp, char * p_basename, const char * p_ext, int & seq) {
 
 	char a_filename [256];
 	struct  stat stats;
diff --git a/ggrab/tools.h b/ggrab/tools.h
index 0eac705..fd55e1f 100644
--- a/ggrab/tools.h
+++ b/ggrab/tools.h
@@ -9,19 +9,19 @@
 extern bool gcore;
 extern bool gloop;
 
-typedef enum STARTFLAG {NO_START=0, START_SEQ, START_GOP};
+enum STARTFLAG {NO_START=0, START_SEQ, START_GOP};
 
 typedef double PTS;
 
 PTS 	pes_pts (const unsigned char * p_buffer);
 int 	pes_len (const unsigned char * p_buffer);
-FILE *  open_next_output_file (FILE * fp, char * p_basename, char * p_ext, int & seq);
+FILE *  open_next_output_file (FILE * fp, char * p_basename, const char * p_ext, int & seq);
 
 void 	fill_pes_len(unsigned char * p_pes, int len);
 void 	fill_pes_pts(unsigned char * p_pes, PTS pts);
 void 	fill_pp_scr (unsigned char * p_pp, PTS scr);
 
-void 	errexit(char* p_text);
+void 	errexit(const char* p_text);
 
 
 

-----------------------------------------------------------------------

Summary of changes:
 ggrab/cbuffer.h     |    2 +-
 ggrab/ggrab.cpp     |   21 +++++++++++----------
 ggrab/pesstream.cpp |   10 ++++++----
 ggrab/pesstream.h   |    4 ++--
 ggrab/sserver.cpp   |   10 +++++-----
 ggrab/tools.cpp     |    4 ++--
 ggrab/tools.h       |    6 +++---
 7 files changed, 30 insertions(+), 27 deletions(-)


-- 
Tuxbox-GIT: hostapps




2012	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (5)
2013	Jan (8)	Feb (6)	Mar (5)	Apr (7)	May (3)	Jun (5)	Jul	Aug (2)	Sep (4)	Oct (2)	Nov (8)	Dec (2)
2014	Jan (3)	Feb (2)	Mar (2)	Apr (3)	May	Jun	Jul (5)	Aug (4)	Sep	Oct (4)	Nov (5)	Dec (1)
2015	Jan	Feb (6)	Mar (24)	Apr (29)	May (43)	Jun (17)	Jul (2)	Aug	Sep	Oct	Nov	Dec

tuxbox-cvs-commits Mailing List for Tuxbox-Project (Page 5)

Tuxbox Sources

tuxbox-cvs-commits — Tuxbox-commit messages