Commit b3cbcc25 authored by Nikias Bassen's avatar Nikias Bassen

xplist: Silence compiler warnings about shadowing global declarations

parent 6a38f512
...@@ -136,11 +136,11 @@ static struct node_t* new_key_node(const char* name) ...@@ -136,11 +136,11 @@ static struct node_t* new_key_node(const char* name)
return node_create(NULL, data); return node_create(NULL, data);
} }
static struct node_t* new_uint_node(uint64_t uint) static struct node_t* new_uint_node(uint64_t value)
{ {
plist_data_t data = plist_new_plist_data(); plist_data_t data = plist_new_plist_data();
data->type = PLIST_UINT; data->type = PLIST_UINT;
data->intval = uint; data->intval = value;
data->length = sizeof(uint64_t); data->length = sizeof(uint64_t);
return node_create(NULL, data); return node_create(NULL, data);
} }
...@@ -222,8 +222,8 @@ static void node_to_xml(node_t* node, void *xml_struct) ...@@ -222,8 +222,8 @@ static void node_to_xml(node_t* node, void *xml_struct)
case PLIST_DATE: case PLIST_DATE:
tag = XPLIST_DATE; tag = XPLIST_DATE;
{ {
time_t time = (time_t)node_data->timeval.tv_sec; time_t timev = (time_t)node_data->timeval.tv_sec;
struct tm *btime = gmtime(&time); struct tm *btime = gmtime(&timev);
if (btime) { if (btime) {
val = (char*)malloc(24); val = (char*)malloc(24);
memset(val, 0, 24); memset(val, 0, 24);
...@@ -395,14 +395,14 @@ static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node) ...@@ -395,14 +395,14 @@ static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node)
if (!xmlStrcmp(node->name, XPLIST_DATE)) if (!xmlStrcmp(node->name, XPLIST_DATE))
{ {
xmlChar *strval = xmlNodeGetContent(node); xmlChar *strval = xmlNodeGetContent(node);
time_t time = 0; time_t timev = 0;
if (strlen((const char*)strval) >= 11) { if (strlen((const char*)strval) >= 11) {
struct tm btime; struct tm btime;
struct tm* tm_utc; struct tm* tm_utc;
parse_date((const char*)strval, &btime); parse_date((const char*)strval, &btime);
time = mktime(&btime); timev = mktime(&btime);
tm_utc = gmtime(&time); tm_utc = gmtime(&timev);
time -= (mktime(tm_utc) - time); timev -= (mktime(tm_utc) - timev);
} }
data->timeval.tv_sec = (long)time; data->timeval.tv_sec = (long)time;
data->timeval.tv_usec = 0; data->timeval.tv_usec = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment