X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fwgt-info.c;h=9ff7766c5c51701de18bcda1287fe418f740a25c;hb=86be207174efcb84f6eb22946724a25a3cd9b56c;hp=02a619b45bb23b85a868a74cf4f0d2bed162c5f9;hpb=32b15670d36b31b39a9ae2215ff0d1679e211169;p=src%2Fapp-framework-main.git diff --git a/src/wgt-info.c b/src/wgt-info.c index 02a619b..9ff7766 100644 --- a/src/wgt-info.c +++ b/src/wgt-info.c @@ -1,5 +1,5 @@ /* - Copyright 2015 IoT.bzh + Copyright 2015, 2016, 2017 IoT.bzh author: José Bollo @@ -20,6 +20,7 @@ #include #include #include +#include #include @@ -77,7 +78,7 @@ static xmlChar *optcontent(xmlNodePtr node) static char *mkver(char *version) { - int lver; + unsigned int lver; char c, *r; if (version) { c = version[lver = 0]; @@ -100,7 +101,7 @@ static char *mkver(char *version) static char *mkidaver(char *id, char *ver) { - int lid, lver; + size_t lid, lver; char *r; if (id && ver) { lid = strlen(id); @@ -117,6 +118,16 @@ static char *mkidaver(char *id, char *ver) return NULL; } +static void make_lowercase(char *s) +{ + if (s) { + while(*s) { + *s = (char)tolower(*s); + s++; + } + } +} + static int fill_desc(struct wgt_desc *desc, int want_icons, int want_features, int want_preferences) { xmlNodePtr node, pnode; @@ -132,8 +143,10 @@ static int fill_desc(struct wgt_desc *desc, int want_icons, int want_features, i return -1; } desc->id = xmlGetProp(node, wgt_config_string_id); + make_lowercase(desc->id); desc->version = xmlGetProp(node, wgt_config_string_version); desc->ver = mkver(desc->version); + make_lowercase(desc->ver); desc->idaver = mkidaver(desc->id, desc->ver); desc->width = getpropnum(node, wgt_config_string_width, 0); desc->height = getpropnum(node, wgt_config_string_height, 0);