X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fwgt-config.c;h=39f72ceffbf9210baf78168c960de1f9f9470386;hb=fd61febe4d3275e02d15440d6632327aa69ce636;hp=04548c3121e20d02fb1a5bd16475f8a7559bf8d4;hpb=f3d64b7c741677cd28e2a11deed67196cd02b46a;p=src%2Fapp-framework-main.git diff --git a/src/wgt-config.c b/src/wgt-config.c index 04548c3..39f72ce 100644 --- a/src/wgt-config.c +++ b/src/wgt-config.c @@ -1,5 +1,7 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016 IoT.bzh + + author: José Bollo Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -16,7 +18,6 @@ #include #include -#include #include #include @@ -24,6 +25,7 @@ #include #include +#include "verbose.h" #include "wgt.h" #include "wgt-config.h" @@ -71,10 +73,10 @@ static xmlNodePtr first(const char *type) return next(xmlDocGetRootElement(configxml)->children, type); } -static int scorelang(xmlNodePtr node) +static unsigned int scorelang(xmlNodePtr node) { char *lang = xmlNodeGetLang(node); - int score = wgt_locales_score(configwgt, lang); + unsigned int score = wgt_locales_score(configwgt, lang); xmlFree(lang); return score; } @@ -82,7 +84,7 @@ static int scorelang(xmlNodePtr node) static xmlNodePtr element_based_localisation(const char *type) { xmlNodePtr resu, elem; - int sr, s; + unsigned int sr, s; resu = first(type); if (resu) { @@ -115,13 +117,13 @@ int wgt_config_open(struct wgt *wgt) assert(!configxml); fd = wgt_open_read(wgt, wgt_config_string_xml_file); if (fd < 0) { - syslog(LOG_ERR, "can't open config file %s", wgt_config_string_xml_file); + ERROR("can't open config file %s", wgt_config_string_xml_file); return fd; } configxml = xmlReadFd(fd, wgt_config_string_xml_file, NULL, 0); close(fd); if (configxml == NULL) { - syslog(LOG_ERR, "xml parse of config file %s failed", wgt_config_string_xml_file); + ERROR("xml parse of config file %s failed", wgt_config_string_xml_file); return -1; } assert(xmlDocGetRootElement(configxml));