diff options
| author | 2014-05-18 03:25:58 +0200 | |
|---|---|---|
| committer | 2014-05-18 03:25:58 +0200 | |
| commit | b3cbcc256ab1f034dc3122517aab1be2a9d932e6 (patch) | |
| tree | e96f5cd963d0b13c81bb67fa5ef36d29b31a5960 /src/xplist.c | |
| parent | 6a38f51266829feb975cdd8daed6656842e5ecd9 (diff) | |
| download | libplist-b3cbcc256ab1f034dc3122517aab1be2a9d932e6.tar.gz libplist-b3cbcc256ab1f034dc3122517aab1be2a9d932e6.tar.bz2 | |
xplist: Silence compiler warnings about shadowing global declarations
Diffstat (limited to 'src/xplist.c')
| -rw-r--r-- | src/xplist.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/xplist.c b/src/xplist.c index 405a844..62c624e 100644 --- a/src/xplist.c +++ b/src/xplist.c | |||
| @@ -136,11 +136,11 @@ static struct node_t* new_key_node(const char* name) | |||
| 136 | return node_create(NULL, data); | 136 | return node_create(NULL, data); |
| 137 | } | 137 | } |
| 138 | 138 | ||
| 139 | static struct node_t* new_uint_node(uint64_t uint) | 139 | static struct node_t* new_uint_node(uint64_t value) |
| 140 | { | 140 | { |
| 141 | plist_data_t data = plist_new_plist_data(); | 141 | plist_data_t data = plist_new_plist_data(); |
| 142 | data->type = PLIST_UINT; | 142 | data->type = PLIST_UINT; |
| 143 | data->intval = uint; | 143 | data->intval = value; |
| 144 | data->length = sizeof(uint64_t); | 144 | data->length = sizeof(uint64_t); |
| 145 | return node_create(NULL, data); | 145 | return node_create(NULL, data); |
| 146 | } | 146 | } |
| @@ -222,8 +222,8 @@ static void node_to_xml(node_t* node, void *xml_struct) | |||
| 222 | case PLIST_DATE: | 222 | case PLIST_DATE: |
| 223 | tag = XPLIST_DATE; | 223 | tag = XPLIST_DATE; |
| 224 | { | 224 | { |
| 225 | time_t time = (time_t)node_data->timeval.tv_sec; | 225 | time_t timev = (time_t)node_data->timeval.tv_sec; |
| 226 | struct tm *btime = gmtime(&time); | 226 | struct tm *btime = gmtime(&timev); |
| 227 | if (btime) { | 227 | if (btime) { |
| 228 | val = (char*)malloc(24); | 228 | val = (char*)malloc(24); |
| 229 | memset(val, 0, 24); | 229 | memset(val, 0, 24); |
| @@ -395,14 +395,14 @@ static void xml_to_node(xmlNodePtr xml_node, plist_t * plist_node) | |||
| 395 | if (!xmlStrcmp(node->name, XPLIST_DATE)) | 395 | if (!xmlStrcmp(node->name, XPLIST_DATE)) |
| 396 | { | 396 | { |
| 397 | xmlChar *strval = xmlNodeGetContent(node); | 397 | xmlChar *strval = xmlNodeGetContent(node); |
| 398 | time_t time = 0; | 398 | time_t timev = 0; |
| 399 | if (strlen((const char*)strval) >= 11) { | 399 | if (strlen((const char*)strval) >= 11) { |
| 400 | struct tm btime; | 400 | struct tm btime; |
| 401 | struct tm* tm_utc; | 401 | struct tm* tm_utc; |
| 402 | parse_date((const char*)strval, &btime); | 402 | parse_date((const char*)strval, &btime); |
| 403 | time = mktime(&btime); | 403 | timev = mktime(&btime); |
| 404 | tm_utc = gmtime(&time); | 404 | tm_utc = gmtime(&timev); |
| 405 | time -= (mktime(tm_utc) - time); | 405 | timev -= (mktime(tm_utc) - timev); |
| 406 | } | 406 | } |
| 407 | data->timeval.tv_sec = (long)time; | 407 | data->timeval.tv_sec = (long)time; |
| 408 | data->timeval.tv_usec = 0; | 408 | data->timeval.tv_usec = 0; |
