|
@@ -530,17 +530,15 @@ int set_time_zone(struct tm *t, int zone)
|
|
|
return -1;
|
|
return -1;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- r = set_tzone(zone);
|
|
|
|
|
|
|
+ r = set_time(t, zone);
|
|
|
if(r) {
|
|
if(r) {
|
|
|
- log_e("__1__ set_tzone failed\n");
|
|
|
|
|
|
|
+ log_e("__1__ set_time failed\n");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- //print_time("111", t);
|
|
|
|
|
- r = set_time(t, zone);
|
|
|
|
|
|
|
+ r = set_tzone(zone);
|
|
|
if(r) {
|
|
if(r) {
|
|
|
- log_e("__1__ set_time failed\n");
|
|
|
|
|
|
|
+ log_e("__1__ set_tzone failed\n");
|
|
|
}
|
|
}
|
|
|
- //print_utc("222", time(NULL));
|
|
|
|
|
|
|
|
|
|
return r;
|
|
return r;
|
|
|
}
|
|
}
|
|
@@ -550,15 +548,16 @@ int set_utctime_zone(time_t t, int zone)
|
|
|
{
|
|
{
|
|
|
int r;
|
|
int r;
|
|
|
|
|
|
|
|
- r = set_tzone(zone);
|
|
|
|
|
|
|
+ r = set_utctime(t);
|
|
|
if(r) {
|
|
if(r) {
|
|
|
- log_e("__2__ set_zone failed\n");
|
|
|
|
|
|
|
+ log_e("__2__ set_time failed\n");
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- r = set_utctime(t);
|
|
|
|
|
|
|
+ r = set_tzone(zone);
|
|
|
if(r) {
|
|
if(r) {
|
|
|
- log_e("__2__ set_time failed\n");
|
|
|
|
|
|
|
+ log_e("__2__ set_zone failed\n");
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
|
|
|
|
|
return r;
|
|
return r;
|
|
|
}
|
|
}
|