Merge branch 'prepare_for_master' of https://git.trustie.net/xuos/xiuos into xidatong-arm32
This commit is contained in:
@@ -324,7 +324,7 @@ void TestSocket(int argc, char* argv[])
|
||||
return;
|
||||
} else {
|
||||
memset(iperf_param.host, 0, sizeof(iperf_param.host));
|
||||
strncpy(iperf_param.host, ip_ptr, strlen(ip_ptr));
|
||||
strncpy(iperf_param.host, ip_ptr, sizeof(iperf_param.host));
|
||||
}
|
||||
iperf_mode->mode = IPERF_MODE_CLIENT;
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ static int PrivLcdIoctl(int fd, int cmd, void *args)
|
||||
|
||||
int PrivIoctl(int fd, int cmd, void *args)
|
||||
{
|
||||
int ret;
|
||||
int ret = -ERROR;
|
||||
struct PrivIoctlCfg *ioctl_cfg = (struct PrivIoctlCfg *)args;
|
||||
switch (ioctl_cfg->ioctl_driver_type)
|
||||
{
|
||||
|
||||
@@ -66,7 +66,7 @@ int timer_create(clockid_t clockid, struct sigevent * evp, timer_t * timerid)
|
||||
}
|
||||
|
||||
memset(timer_name, 0, sizeof(timer_name));
|
||||
snprintf(timer_name, sizeof(timer_name), "timer_%d", clockid);
|
||||
snprintf(timer_name, sizeof(timer_name), "timer_%ld", clockid);
|
||||
|
||||
sem_init(&timer_sem, 0, 0);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user