generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

White spaces and some debugging information.

Browse Source 
(cherry picked from commit c8af5ec806a92b3a8bd096a36fb0f625350d8d19)
This commit is contained in:
Marcelo Roberto Jimenez 2010-12-22 09:55:48 -02:00
parent 3ec9b0c015
commit 0679697ffd
2 changed files with 33 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upnp/sample/Makefile.am
View File

@ -14,7 +14,6 @@ LDADD = \
$(top_builddir)/threadutil/libthreadutil.la \ $(top_builddir)/threadutil/libthreadutil.la \
$(top_builddir)/ixml/libixml.la $(top_builddir)/ixml/libixml.la
# samples # samples
noinst_PROGRAMS = noinst_PROGRAMS =
if ENABLE_SAMPLES if ENABLE_SAMPLES
@ -40,7 +39,6 @@ tv_device_CPPFLAGS = \
endif endif
endif endif
tv_device_SOURCES = \ tv_device_SOURCES = \
common/sample_util.c \ common/sample_util.c \
common/sample_util.h \ common/sample_util.h \
@ -48,7 +46,6 @@ tv_device_SOURCES = \
common/tv_device.h \ common/tv_device.h \
linux/tv_device_main.c linux/tv_device_main.c
tv_ctrlpt_SOURCES = \ tv_ctrlpt_SOURCES = \
common/sample_util.c \ common/sample_util.c \
common/sample_util.h \ common/sample_util.h \
@ -65,7 +62,6 @@ tv_combo_SOURCES = \
common/tv_device.h \ common/tv_device.h \
linux/tv_combo_main.c linux/tv_combo_main.c
if WITH_DOCUMENTATION if WITH_DOCUMENTATION
examplesdir = $(docdir)/examples examplesdir = $(docdir)/examples
examples_DATA = \ examples_DATA = \
@ -74,7 +70,6 @@ examples_DATA = \
$(tv_device_SOURCES)) $(tv_device_SOURCES))
endif endif
EXTRA_DIST = \ EXTRA_DIST = \
web/tvcombodesc.xml \ web/tvcombodesc.xml \
web/tvcontrolSCPD.xml \ web/tvcontrolSCPD.xml \

83
upnp/sample/common/sample_util.c
View File

@ -42,7 +42,7 @@
#if !UPNP_HAVE_TOOLS #if !UPNP_HAVE_TOOLS
# error "Need upnptools.h to compile samples ; try ./configure --enable-tools" # error "Need upnptools.h to compile samples; try ./configure --enable-tools"
#endif #endif
@ -104,9 +104,8 @@ char *SampleUtil_GetElementValue(IXML_Element *element)
IXML_Node *child = ixmlNode_getFirstChild((IXML_Node *)element); IXML_Node *child = ixmlNode_getFirstChild((IXML_Node *)element);
char *temp = NULL; char *temp = NULL;
if (child != 0 && ixmlNode_getNodeType(child) == eTEXT_NODE) { if (child != 0 && ixmlNode_getNodeType(child) == eTEXT_NODE)
temp = strdup(ixmlNode_getNodeValue(child)); temp = strdup(ixmlNode_getNodeValue(child));
}
return temp; return temp;
} }
@ -127,9 +126,8 @@ IXML_NodeList *SampleUtil_GetFirstServiceList(IXML_Document *doc)
ServiceList = ixmlElement_getElementsByTagName( ServiceList = ixmlElement_getElementsByTagName(
(IXML_Element *)servlistnode, "service"); (IXML_Element *)servlistnode, "service");
} }
if (servlistnodelist) { if (servlistnodelist)
ixmlNodeList_free(servlistnodelist); ixmlNodeList_free(servlistnodelist);
}
return ServiceList; return ServiceList;
} }
@ -179,10 +177,8 @@ static IXML_NodeList *SampleUtil_GetNthServiceList(
ServiceList = ixmlElement_getElementsByTagName( ServiceList = ixmlElement_getElementsByTagName(
(IXML_Element *)servlistnode, "service"); (IXML_Element *)servlistnode, "service");
} }
if (servlistnodelist)
if (servlistnodelist) {
ixmlNodeList_free(servlistnodelist); ixmlNodeList_free(servlistnodelist);
}
return ServiceList; return ServiceList;
} }
@ -200,34 +196,33 @@ char *SampleUtil_GetFirstDocumentItem(IXML_Document *doc, const char *item)
if (tmpNode) { if (tmpNode) {
textNode = ixmlNode_getFirstChild(tmpNode); textNode = ixmlNode_getFirstChild(tmpNode);
if (!textNode) { if (!textNode) {
SampleUtil_Print("sample_util.c: (bug) " SampleUtil_Print("%s(%d): (BUG) ixmlNode_getFirstChild(tmpNode) returned NULL\n",
"ixmlNode_getFirstChild(tmpNode) " __FILE__, __LINE__);
"returned NULL\n");
ret = strdup(""); ret = strdup("");
goto epilogue; goto epilogue;
} }
if (!ixmlNode_getNodeValue(textNode)) { if (!ixmlNode_getNodeValue(textNode)) {
SampleUtil_Print("ixmlNode_getNodeValue " SampleUtil_Print("%s(%d): ixmlNode_getNodeValue returned NULL\n",
"returned NULL\n"); __FILE__, __LINE__);
ret = strdup(""); ret = strdup("");
goto epilogue; goto epilogue;
} else { } else {
ret = strdup(ixmlNode_getNodeValue(textNode)); ret = strdup(ixmlNode_getNodeValue(textNode));
} }
} else { } else {
SampleUtil_Print("ixmlNode_getFirstChild(tmpNode) " SampleUtil_Print("%s(%d): ixmlNode_getFirstChild(tmpNode) returned NULL\n",
"returned NULL\n"); __FILE__, __LINE__);
goto epilogue; goto epilogue;
} }
} else { } else {
SampleUtil_Print("Error finding %s in XML Node\n", item); SampleUtil_Print("%s(%d): Error finding %s in XML Node\n",
__FILE__, __LINE__, item);
goto epilogue; goto epilogue;
} }
epilogue: epilogue:
if (nodeList) { if (nodeList)
ixmlNodeList_free(nodeList); ixmlNodeList_free(nodeList);
}
return ret; return ret;
} }
@ -241,24 +236,23 @@ char *SampleUtil_GetFirstElementItem(IXML_Element *element, const char *item)
nodeList = ixmlElement_getElementsByTagName(element, (char *)item); nodeList = ixmlElement_getElementsByTagName(element, (char *)item);
if (nodeList == NULL) { if (nodeList == NULL) {
SampleUtil_Print( "Error finding %s in XML Node\n", item); SampleUtil_Print("%s(%d): Error finding %s in XML Node\n",
__FILE__, __LINE__, item);
return NULL; return NULL;
} }
tmpNode = ixmlNodeList_item(nodeList, 0); tmpNode = ixmlNodeList_item(nodeList, 0);
if (tmpNode) { if (tmpNode) {
SampleUtil_Print("Error finding %s value in XML Node\n", item); SampleUtil_Print("%s(%d): Error finding %s value in XML Node\n",
__FILE__, __LINE__, item);
ixmlNodeList_free(nodeList); ixmlNodeList_free(nodeList);
return NULL; return NULL;
} }
textNode = ixmlNode_getFirstChild(tmpNode); textNode = ixmlNode_getFirstChild(tmpNode);
ret = strdup(ixmlNode_getNodeValue(textNode)); ret = strdup(ixmlNode_getNodeValue(textNode));
if (!ret) { if (!ret) {
SampleUtil_Print("Error allocating memory for %s in XML Node\n", SampleUtil_Print("%s(%d): Error allocating memory for %s in XML Node\n",
item); __FILE__, __LINE__, item);
ixmlNodeList_free(nodeList); ixmlNodeList_free(nodeList);
return NULL; return NULL;
} }
ixmlNodeList_free(nodeList); ixmlNodeList_free(nodeList);
@ -570,11 +564,10 @@ int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
IXML_Element *service = NULL; IXML_Element *service = NULL;
baseURL = SampleUtil_GetFirstDocumentItem(DescDoc, "URLBase"); baseURL = SampleUtil_GetFirstDocumentItem(DescDoc, "URLBase");
if (baseURL) { if (baseURL)
base = baseURL; base = baseURL;
} else { else
base = location; base = location;
}
/* Top level */ /* Top level */
for (sindex = 0; for (sindex = 0;
@ -589,34 +582,27 @@ int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
length = ixmlNodeList_length(serviceList); length = ixmlNodeList_length(serviceList);
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
service = (IXML_Element *)ixmlNodeList_item(serviceList, i); service = (IXML_Element *)ixmlNodeList_item(serviceList, i);
tempServiceType = tempServiceType = SampleUtil_GetFirstElementItem(
SampleUtil_GetFirstElementItem( (IXML_Element *)service, "serviceType");
(IXML_Element *)service, "serviceType");
if (strcmp(tempServiceType, serviceType) == 0) { if (strcmp(tempServiceType, serviceType) == 0) {
SampleUtil_Print("Found service: %s\n", serviceType); SampleUtil_Print("Found service: %s\n", serviceType);
*serviceId = *serviceId = SampleUtil_GetFirstElementItem(service, "serviceId");
SampleUtil_GetFirstElementItem(service, "serviceId");
SampleUtil_Print("serviceId: %s\n", *serviceId); SampleUtil_Print("serviceId: %s\n", *serviceId);
relcontrolURL = relcontrolURL = SampleUtil_GetFirstElementItem(service, "controlURL");
SampleUtil_GetFirstElementItem(service, "controlURL"); releventURL = SampleUtil_GetFirstElementItem(service, "eventSubURL");
releventURL = *controlURL = malloc(strlen(base) + strlen(relcontrolURL)+1);
SampleUtil_GetFirstElementItem(service, "eventSubURL");
*controlURL =
malloc(strlen(base) + strlen(relcontrolURL)+1);
if (*controlURL) { if (*controlURL) {
ret = UpnpResolveURL(base, relcontrolURL, *controlURL); ret = UpnpResolveURL(base, relcontrolURL, *controlURL);
if (ret != UPNP_E_SUCCESS) { if (ret != UPNP_E_SUCCESS)
SampleUtil_Print("Error generating controlURL from %s + %s\n", SampleUtil_Print("Error generating controlURL from %s + %s\n",
base, relcontrolURL); base, relcontrolURL);
}
} }
*eventURL = malloc(strlen(base) + strlen(releventURL)+1); *eventURL = malloc(strlen(base) + strlen(releventURL)+1);
if (*eventURL) { if (*eventURL) {
ret = UpnpResolveURL(base, releventURL, *eventURL); ret = UpnpResolveURL(base, releventURL, *eventURL);
if (ret != UPNP_E_SUCCESS) { if (ret != UPNP_E_SUCCESS)
SampleUtil_Print("Error generating eventURL from %s + %s\n", SampleUtil_Print("Error generating eventURL from %s + %s\n",
base, releventURL); base, releventURL);
}
} }
free(relcontrolURL); free(relcontrolURL);
free(releventURL); free(releventURL);
@ -630,9 +616,8 @@ int SampleUtil_FindAndParseService(IXML_Document *DescDoc, const char *location,
} }
free(tempServiceType); free(tempServiceType);
tempServiceType = NULL; tempServiceType = NULL;
if (serviceList) { if (serviceList)
ixmlNodeList_free(serviceList); ixmlNodeList_free(serviceList);
}
serviceList = NULL; serviceList = NULL;
} }
free(baseURL); free(baseURL);
@ -653,9 +638,8 @@ int SampleUtil_Print(const char *fmt, ...)
va_start(ap, fmt); va_start(ap, fmt);
rc = vsnprintf(buf, MAX_BUF, fmt, ap); rc = vsnprintf(buf, MAX_BUF, fmt, ap);
va_end(ap); va_end(ap);
if (gPrintFun) { if (gPrintFun)
gPrintFun("%s", buf); gPrintFun("%s", buf);
}
ithread_mutex_unlock(&display_mutex); ithread_mutex_unlock(&display_mutex);
@ -666,9 +650,8 @@ void SampleUtil_StateUpdate(const char *varName, const char *varValue,
const char *UDN, eventType type) const char *UDN, eventType type)
{ {
/* TBD: Add mutex here? */ /* TBD: Add mutex here? */
if (gStateUpdateFun) { if (gStateUpdateFun)
gStateUpdateFun(varName, varValue, UDN, type); gStateUpdateFun(varName, varValue, UDN, type);
}
} }
/*! /*!
@ -677,9 +660,9 @@ void SampleUtil_StateUpdate(const char *varName, const char *varValue,
void linux_print(const char *format, ...) void linux_print(const char *format, ...)
{ {
va_list argList; va_list argList;
va_start(argList, format); va_start(argList, format);
vfprintf(stdout, format, argList); vfprintf(stdout, format, argList);
fflush(stdout); fflush(stdout);
va_end(argList); va_end(argList);
} }