moonlight-stream/moonlight-embedded
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-embedded.git synced 2026-04-18 22:39:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename functions in libgamestream and provide better error handling

Browse Source
This commit is contained in:
Iwan Timmer
2015-07-23 11:43:48 +02:00
parent 0b02016a6c
commit c18bd2d194
15 changed files with 302 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libgamestream/xml.c
View File

@@ -18,9 +18,9 @@
*/
#include "xml.h"
#include "errors.h"
#include "expat.h"
#include <expat.h>
#include <string.h>
struct xml_query {
@@ -45,12 +45,13 @@ static void XMLCALL _xml_end_element(void *userData, const char *name) {
static void XMLCALL _xml_start_applist_element(void *userData, const char *name, const char **atts) {
struct xml_query *search = (struct xml_query*) userData;
if (strcmp("App", name) == 0) {
struct app_list* app = malloc(sizeof(struct app_list));
PAPP_LIST app = malloc(sizeof(APP_LIST));
if (app == NULL) {
perror("Not enough memory");
exit(EXIT_FAILURE);
fprintf(stderr, "Not enough memory\n");
return;
}
app->next = (struct app_list*) search->data;
app->next = (PAPP_LIST) search->data;
search->data = app;
} else if (strcmp("ID", name) == 0 || strcmp("AppTitle", name) == 0) {
search->memory = malloc(1);
@@ -62,7 +63,10 @@ static void XMLCALL _xml_start_applist_element(void *userData, const char *name,
static void XMLCALL _xml_end_applist_element(void *userData, const char *name) {
struct xml_query *search = (struct xml_query*) userData;
if (search->start) {
struct app_list* list = (struct app_list*) search->data;
PAPP_LIST list = (PAPP_LIST) search->data;
if (list == NULL)
return;
if (strcmp("ID", name) == 0) {
list->id = atoi(search->memory);
free(search->memory);
@@ -79,7 +83,7 @@ static void XMLCALL _xml_write_data(void *userData, const XML_Char *s, int len)
search->memory = realloc(search->memory, search->size + len + 1);
if(search->memory == NULL) {
fprintf(stderr, "Not enough memory\n");
exit(EXIT_FAILURE);
return;
}
memcpy(&(search->memory[search->size]), s, len);
@@ -101,14 +105,17 @@ int xml_search(char* data, size_t len, char* node, char** result) {
if (! XML_Parse(parser, data, len, 1)) {
int code = XML_GetErrorCode(parser);
fprintf(stderr, "XML Error: %s\n", XML_ErrorString(code));
return 1;
}
free(search.memory);
return GS_INVALID;
} else if (search.memory == NULL)
return GS_OUT_OF_MEMORY;
*result = search.memory;
return 0;
return GS_OK;
}
struct app_list* xml_applist(char* data, size_t len) {
int xml_applist(char* data, size_t len, PAPP_LIST app_list) {
struct xml_query query;
query.memory = calloc(1, 1);
query.size = 0;
@@ -121,8 +128,9 @@ struct app_list* xml_applist(char* data, size_t len) {
if (! XML_Parse(parser, data, len, 1)) {
int code = XML_GetErrorCode(parser);
fprintf(stderr, "XML Error %s\n", XML_ErrorString(code));
exit(-1);
return GS_INVALID;
}
app_list = (PAPP_LIST) query.data;
return (struct app_list*) query.data;
return GS_OK;
}