[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-531-gde72609
Tuxbox Sources
Brought to you by:
dbt1
Menu
▾
▴
[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-531-gde72609
|
From: GetAway <tux...@ne...> - 2015-04-18 13:01:54
|
Project "Tuxbox-GIT: apps":
The branch, master has been updated
via de72609832873b066be967e924bda85711f57b1f (commit)
from ffe922052372ccea16f63bb29d726ffa040befc6 (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 de72609832873b066be967e924bda85711f57b1f
Author: Jacek Jendrzej <cra...@go...>
Date: Sat Apr 18 14:41:11 2015 +0200
xmlinterface use const char instand char
Signed-off-by: GetAway <get...@t-...>
diff --git a/dvb/zapit/src/bouquets.cpp b/dvb/zapit/src/bouquets.cpp
index c4c24d0..155b0af 100644
--- a/dvb/zapit/src/bouquets.cpp
+++ b/dvb/zapit/src/bouquets.cpp
@@ -51,7 +51,7 @@ void cp(char * from, char * to);
#define GET_ATTR(node, name, fmt, arg) \
do { \
- char * ptr = xmlGetAttribute(node, name); \
+ const char * ptr = xmlGetAttribute(node, name); \
if ((ptr == NULL) || (sscanf(ptr, fmt, &arg) <= 0)) \
arg = 0; \
} \
@@ -378,15 +378,15 @@ void CBouquetManager::parseBouquetsXml(const xmlNodePtr root)
while ((search = xmlGetNextOccurence(search, "Bouquet")) != NULL)
{
CBouquet *newBouquet;
- char *name = xmlGetAttribute(search, "name");
+ const char *name = xmlGetAttribute(search, "name");
int bnum = existsBouquet(name);
if (bnum != -1)
newBouquet = Bouquets[bnum];
else
{
newBouquet = addBouquet(name);
- char* hidden = xmlGetAttribute(search, "hidden");
- char* locked = xmlGetAttribute(search, "locked");
+ const char* hidden = xmlGetAttribute(search, "hidden");
+ const char* locked = xmlGetAttribute(search, "locked");
newBouquet->type = xmlGetNumericAttribute(search, "type", 16);
newBouquet->bouquet_id = xmlGetNumericAttribute(search, "bouquet_id", 16);
newBouquet->bHidden = hidden ? (strcmp(hidden, "1") == 0) : false;
diff --git a/dvb/zapit/src/getservices.cpp b/dvb/zapit/src/getservices.cpp
index d0412cc..c9f7288 100644
--- a/dvb/zapit/src/getservices.cpp
+++ b/dvb/zapit/src/getservices.cpp
@@ -146,7 +146,7 @@ void ParseChannels(xmlNodePtr node, const t_transport_stream_id transport_stream
name = xmlGetAttribute(node, "name");
service_type = xmlGetNumericAttribute(node, "service_type", 16);
- char *ptr = xmlGetAttribute(node, "action");
+ const char *ptr = xmlGetAttribute(node, "action");
bool remove = ptr ? (!strcmp(ptr, "remove") || !strcmp(ptr, "replace")) : false;
bool add = ptr ? (!strcmp(ptr, "add") || !strcmp(ptr, "replace")) : true;
if (remove) {
diff --git a/dvb/zapit/src/zapit.cpp b/dvb/zapit/src/zapit.cpp
index ac31d42..2998f08 100644
--- a/dvb/zapit/src/zapit.cpp
+++ b/dvb/zapit/src/zapit.cpp
@@ -1965,7 +1965,6 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
}
uint32_t satlength;
- char * satname;
xmlNodePtr search = xmlDocGetRootElement(scanInputParser)->xmlChildrenNode;
const char * frontendname = getFrontendName();
CZapitClient::responseGetSatelliteList sat;
@@ -1973,7 +1972,7 @@ bool parse_command(CBasicMessage::Header &rmsg, int connfd)
if (frontendname != NULL) {
while ((search = xmlGetNextOccurence(search, frontendname)) != NULL)
{
- satname = xmlGetAttribute(search, "name");
+ const char * satname = xmlGetAttribute(search, "name");
strncpy(sat.satName, satname, 29);
sat.satName[29] = '\0';
sat.satPosition = satellitePositions[satname];
diff --git a/misc/libs/libxmltree/xmlinterface.cpp b/misc/libs/libxmltree/xmlinterface.cpp
index b09d176..2856664 100644
--- a/misc/libs/libxmltree/xmlinterface.cpp
+++ b/misc/libs/libxmltree/xmlinterface.cpp
@@ -46,7 +46,7 @@
unsigned long xmlGetNumericAttribute(const xmlNodePtr node, const char *name, const int base)
{
- char *ptr = xmlGetAttribute(node, name);
+ const char *ptr = xmlGetAttribute(node, name);
if (!ptr)
return 0;
@@ -56,7 +56,7 @@ unsigned long xmlGetNumericAttribute(const xmlNodePtr node, const char *name, co
long xmlGetSignedNumericAttribute(const xmlNodePtr node, const char *name, const int base)
{
- char *ptr = xmlGetAttribute(node, name);
+ const char *ptr = xmlGetAttribute(node, name);
if (!ptr)
return 0;
diff --git a/misc/libs/libxmltree/xmlinterface.h b/misc/libs/libxmltree/xmlinterface.h
index cf3736f..d149cf0 100644
--- a/misc/libs/libxmltree/xmlinterface.h
+++ b/misc/libs/libxmltree/xmlinterface.h
@@ -41,8 +41,8 @@
#ifdef USE_LIBXML
#include <libxml/parser.h>
#define xmlNextNode next
-inline char* xmlGetAttribute (xmlNodePtr cur, const char * s) { return (char *)xmlGetProp(cur, (const xmlChar *)s); };
-inline char* xmlGetName (xmlNodePtr cur) { return (char *)(cur->name); };
+inline const char* xmlGetAttribute (xmlNodePtr cur, const char * s) { return (const char *)xmlGetProp(cur, (const xmlChar *)s); };
+inline const char* xmlGetName (xmlNodePtr cur) { return (const char *)(cur->name); };
#else /* use libxmltree */
#include "xmltree.h"
@@ -52,9 +52,9 @@ typedef XMLTreeNode* xmlNodePtr;
#define xmlNextNode GetNext()
inline xmlNodePtr xmlDocGetRootElement(xmlDocPtr doc) { return doc->RootNode(); };
inline void xmlFreeDoc (xmlDocPtr doc) { delete doc; };
-inline char* xmlGetAttribute (xmlNodePtr cur, const char *s) { return cur->GetAttributeValue(s); };
-inline char* xmlGetName (xmlNodePtr cur) { return cur->GetType(); };
-inline char* xmlGetData (xmlNodePtr cur) { return cur->GetData(); };
+inline const char* xmlGetAttribute (xmlNodePtr cur, const char *s) { return cur->GetAttributeValue(s); };
+inline const char* xmlGetName (xmlNodePtr cur) { return cur->GetType(); };
+inline const char* xmlGetData (xmlNodePtr cur) { return cur->GetData(); };
#endif /* USE_LIBXML */
diff --git a/tuxbox/neutrino/src/gui/audioplayer.cpp b/tuxbox/neutrino/src/gui/audioplayer.cpp
index 3c2dd77..cecf479 100644
--- a/tuxbox/neutrino/src/gui/audioplayer.cpp
+++ b/tuxbox/neutrino/src/gui/audioplayer.cpp
@@ -1098,10 +1098,10 @@ void CAudioPlayerGui::scanXmlData(xmlDocPtr answer_parser, const char *nametag,
neutrino_msg_data_t data;
g_RCInput->getMsg(&msg, &data, 0);
while (element && msg != CRCInput::RC_home) {
- char *ptr = NULL;
- char *name = NULL;
- char *url = NULL;
- char *type = NULL;
+ const char *ptr = NULL;
+ const char *name = NULL;
+ const char *url = NULL;
+ const char *type = NULL;
time_t bitrate = 0;
bool skip = true;
listPos++;
diff --git a/tuxbox/neutrino/src/gui/filebrowser.cpp b/tuxbox/neutrino/src/gui/filebrowser.cpp
index e7fff11..4351daf 100644
--- a/tuxbox/neutrino/src/gui/filebrowser.cpp
+++ b/tuxbox/neutrino/src/gui/filebrowser.cpp
@@ -471,7 +471,7 @@ bool CFileBrowser::readDir_vlc(const std::string & dirname, CFileList* flist)
if (answer_parser != NULL) {
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
- char *ptr;
+ const char *ptr;
if (element == NULL) {
printf("[FileBrowser] vlc: Drive is not readable. Possibly no disc inserted\n");
CFile file;
@@ -590,7 +590,7 @@ and add to neutrino playlist
xmlDocPtr answer_parser = parseXml(answer.c_str());
if (answer_parser != NULL) {
- char *ptr;
+ const char *ptr;
unsigned char xml_decode = 0;
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
@@ -609,7 +609,7 @@ and add to neutrino playlist
file.Time = 0;
flist->push_back(file);
} else {
- char * tunein_base = NULL;
+ const char * tunein_base = NULL;
if (xml_decode == 1) {
CFile file;
diff --git a/tuxbox/neutrino/src/gui/movieplayer.cpp b/tuxbox/neutrino/src/gui/movieplayer.cpp
index 74b17d0..feb1858 100644
--- a/tuxbox/neutrino/src/gui/movieplayer.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer.cpp
@@ -724,7 +724,7 @@ int VlcGetStreamTime()
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
while (element) {
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, "time") == 0) {
return atoi(xmlGetData(element));
}
@@ -756,7 +756,7 @@ int VlcGetStreamLength()
xmlNodePtr element = xmlDocGetRootElement(answer_parser);
element = element->xmlChildrenNode;
while (element) {
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, "length") == 0) {
return atoi(xmlGetData(element));
}
@@ -4682,7 +4682,7 @@ void CMoviePlayerGui::showFileInfoVLC()
}
while (element)
{
- char *data = xmlGetAttribute(element, "name");
+ const char *data = xmlGetAttribute(element, "name");
if (data)
helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, data);
xmlNodePtr element1 = element->xmlChildrenNode;
diff --git a/tuxbox/neutrino/src/gui/movieplayer2.cpp b/tuxbox/neutrino/src/gui/movieplayer2.cpp
index c2565c3..19a9a07 100644
--- a/tuxbox/neutrino/src/gui/movieplayer2.cpp
+++ b/tuxbox/neutrino/src/gui/movieplayer2.cpp
@@ -831,7 +831,7 @@ int VlcGetStatus(const char *attribute)
element = element->xmlChildrenNode;
while (element)
{
- char* tmp = xmlGetName(element);
+ const char* tmp = xmlGetName(element);
if (strcmp(tmp, attribute) == 0)
{
ret = atoi(xmlGetData(element));
@@ -3680,7 +3680,7 @@ void CMoviePlayerGui::showFileInfoVLC()
}
while (element)
{
- char *data = xmlGetAttribute(element, "name");
+ const char *data = xmlGetAttribute(element, "name");
if (data)
helpbox.addLine(NEUTRINO_ICON_BUTTON_RED, data);
xmlNodePtr element1 = element->xmlChildrenNode;
-----------------------------------------------------------------------
Summary of changes:
dvb/zapit/src/bouquets.cpp | 8 ++++----
dvb/zapit/src/getservices.cpp | 2 +-
dvb/zapit/src/zapit.cpp | 3 +--
misc/libs/libxmltree/xmlinterface.cpp | 4 ++--
misc/libs/libxmltree/xmlinterface.h | 10 +++++-----
tuxbox/neutrino/src/gui/audioplayer.cpp | 8 ++++----
tuxbox/neutrino/src/gui/filebrowser.cpp | 6 +++---
tuxbox/neutrino/src/gui/movieplayer.cpp | 6 +++---
tuxbox/neutrino/src/gui/movieplayer2.cpp | 4 ++--
9 files changed, 25 insertions(+), 26 deletions(-)
--
Tuxbox-GIT: apps
|
